Program: Visualization Toolkit
Module: $RCSfile: creawxVTKRenderWindowInteractor.cxx,v $
Language: C++
- Date: $Date: 2009/10/05 19:41:56 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2011/02/17 11:02:08 $
+ Version: $Revision: 1.6 $
- Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen
+ Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
+
#ifdef USE_WXWIDGETS
#ifdef USE_VTK
+#include <assert.h>
+
#include "creawxVTKRenderWindowInteractor.h"
//This is needed for vtk 3.1 :
# include "vtkVersion.h"
#endif
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
# include "vtkCommand.h"
#else
# include "vtkInteractorStyle.h"
#endif
+#include "vtkDebugLeaks.h"
+#ifdef __WXMAC__
+#include "vtkCarbonRenderWindow.h"
+#endif
-
- //Keep this for compatibilty reason, this was introduced in wxGTK 2.4.0
+//Keep this for compatibilty reason, this was introduced in wxGTK 2.4.0
#if (!wxCHECK_VERSION(2, 4, 0))
- wxWindow* wxGetTopLevelParent(wxWindow *win)
- {
+wxWindow* wxGetTopLevelParent(wxWindow *win)
+{
while ( win && !win->IsTopLevel() )
- win = win->GetParent();
+ win = win->GetParent();
return win;
- }
+}
#endif
-//=======================================================================
-
// To access objc calls on cocoa
#ifdef __WXCOCOA__
#ifdef VTK_USE_COCOA
#ifdef __WXGTK__
# include <gdk/gdkx.h> // GDK_WINDOW_XWINDOW is found here in wxWidgets 2.8.0
# include "gdk/gdkprivate.h"
+#if wxCHECK_VERSION(2, 8, 0)
#ifdef __WXGTK20__
#include <wx/gtk/win_gtk.h>
#else
#include <wx/gtk1/win_gtk.h>
#endif
+#else
+#include <wx/gtk/win_gtk.h>
+#endif
#define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \
GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \
GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
#if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
IMPLEMENT_DYNAMIC_CLASS(creawxVTKRenderWindowInteractor, wxGLCanvas)
+
#else
IMPLEMENT_DYNAMIC_CLASS(creawxVTKRenderWindowInteractor, wxWindow)
#endif //__WXGTK__
EVT_ENTER_WINDOW(creawxVTKRenderWindowInteractor::OnEnter)
EVT_LEAVE_WINDOW(creawxVTKRenderWindowInteractor::OnLeave)
EVT_MOUSEWHEEL (creawxVTKRenderWindowInteractor::OnMouseWheel)
-// If we use EVT_KEY_DOWN instead of EVT_CHAR, capital versions
-// of all characters are always returned. EVT_CHAR also performs
-// other necessary keyboard-dependent translations.
- //EVT_KEY_DOWN (creawxVTKRenderWindowInteractor::OnKeyDown)
- EVT_CHAR (creawxVTKRenderWindowInteractor::OnKeyDown)
+ EVT_KEY_DOWN (creawxVTKRenderWindowInteractor::OnKeyDown)
EVT_KEY_UP (creawxVTKRenderWindowInteractor::OnKeyUp)
+ EVT_CHAR (creawxVTKRenderWindowInteractor::OnChar)
#endif
EVT_TIMER (ID_creawxVTKRenderWindowInteractor_TIMER, creawxVTKRenderWindowInteractor::OnTimer)
EVT_SIZE (creawxVTKRenderWindowInteractor::OnSize)
END_EVENT_TABLE()
+vtkCxxRevisionMacro(creawxVTKRenderWindowInteractor, "$Revision: 1.6 $")
+vtkInstantiatorNewMacro(creawxVTKRenderWindowInteractor)
+
//---------------------------------------------------------------------------
#if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
-creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor() : vtkRenderWindowInteractor(), wxGLCanvas()
+#if (wxCHECK_VERSION(2, 8, 0))
+creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor() : wxGLCanvas(0, -1, wxDefaultPosition), vtkRenderWindowInteractor()
#else
-creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor() : vtkRenderWindowInteractor(), wxWindow()
+creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor() : wxGLCanvas(), vtkRenderWindowInteractor()
+#endif
+#else
+creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor() : wxWindow(), vtkRenderWindowInteractor()
#endif //__WXGTK__
, timer(this, ID_creawxVTKRenderWindowInteractor_TIMER)
, ActiveButton(wxEVT_NULL)
, RenderWhenDisabled(1)
, UseCaptureMouse(0)
{
-
+#ifdef VTK_DEBUG_LEAKS
+ vtkDebugLeaks::ConstructClass("creawxVTKRenderWindowInteractor");
+#endif
this->RenderWindow = NULL;
this->SetRenderWindow(vtkRenderWindow::New());
this->RenderWindow->Delete();
-
- //this->SetBackgroundColour( wxColour(255,0,255) );
}
//---------------------------------------------------------------------------
creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor(wxWindow *parent,
long style,
const wxString &name)
#if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
- : vtkRenderWindowInteractor(), wxGLCanvas(parent, id, pos, size, style, name)
+ : wxGLCanvas(parent, id, pos, size, style, name), vtkRenderWindowInteractor()
#else
: wxWindow(parent, id, pos, size, style, name), vtkRenderWindowInteractor()
#endif //__WXGTK__
, RenderWhenDisabled(1)
, UseCaptureMouse(0)
{
-
+#ifdef VTK_DEBUG_LEAKS
+ vtkDebugLeaks::ConstructClass("creawxVTKRenderWindowInteractor");
+#endif
this->RenderWindow = NULL;
this->SetRenderWindow(vtkRenderWindow::New());
this->RenderWindow->Delete();
-
- // this->SetBackgroundColour( wxColour(255,0,0) );
+#ifdef __WXMAC__
+ // On Mac (Carbon) we don't get notified of the initial window size with an EVT_SIZE event,
+ // so we update the size information of the interactor/renderwindow here
+ this->UpdateSize(size.x, size.y);
+#endif
}
//---------------------------------------------------------------------------
creawxVTKRenderWindowInteractor::~creawxVTKRenderWindowInteractor()
-{
- // LG : trompe la mort !
+{
SetRenderWindow(NULL);
- SetReferenceCount(0);
+ SetInteractorStyle(NULL);
}
//---------------------------------------------------------------------------
creawxVTKRenderWindowInteractor * creawxVTKRenderWindowInteractor::New()
assert(false);
return 1;
-
+
}
//---------------------------------------------------------------------------
int creawxVTKRenderWindowInteractor::DestroyTimer()
{
if (!Enabled)
return;
-
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
InvokeEvent(vtkCommand::TimerEvent, NULL);
#else
long handle_tmp = 0;
// __WXMSW__ is for Win32
-//__WXMAX__ stands for using Carbon C-headers, using either the CarbonLib/CFM or the native Mach-O builds (which then also use the latest features available)
+//__WXMAC__ stands for using Carbon C-headers, using either the CarbonLib/CFM or the native Mach-O builds (which then also use the latest features available)
// __WXGTK__ is for both gtk 1.2.x and gtk 2.x
#if defined(__WXMSW__) || defined(__WXMAC__)
handle_tmp = (long)this->GetHandle();
// Here is how to find the NSWindow
wxTopLevelWindow* toplevel = dynamic_cast<wxTopLevelWindow*>(
wxGetTopLevelParent( this ) );
- if (toplevel != NULL )
+ if (toplevel != NULL )
{
handle_tmp = (long)toplevel->GetNSWindow();
}
- // The NSView will be deducted from
+ // The NSView will be deducted from
// [(NSWindow*)Handle contentView]
// if only I knew how to write that in c++
#endif //__WXCOCOA__
//---------------------------------------------------------------------------
void creawxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event))
{
-
//must always be here
wxPaintDC pDC(this);
#endif //__WXMSW__
}
// get vtk to render to the wxWindows
- //bbtkDebugMessage("Wx",9,"creawxVTKRenderWindowInteractor::OnPaint"<<std::endl);
- //std::cout << "creawxVTKRenderWindowInteractor::OnPaint"<<std::endl;
Render();
-
-#if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
- // bbtkDebugMessage("Core",9,"creawxVTKRenderWindowInteractor::OnPaint public wxGLCanvas, virtual public vtkRenderWindowInteractor \n");
-#else
- // bbtkDebugMessage("Core",9,"creawxVTKRenderWindowInteractor::OnPaint public wxWindow, virtual public vtkRenderWindowInteractor \n");
-#endif //__WXGTK__
-
+#ifdef __WXMAC__
+ // This solves a problem with repainting after a window resize
+ // See also: http://sourceforge.net/mailarchive/forum.php?thread_id=31690967&forum_id=41789
+ vtkCarbonRenderWindow* rwin = vtkCarbonRenderWindow::SafeDownCast(RenderWindow);
+ if( rwin )
+ {
+ rwin->UpdateGLRegion();
+ }
+#endif
}
//---------------------------------------------------------------------------
void creawxVTKRenderWindowInteractor::OnEraseBackground(wxEraseEvent &event)
{
- //printf("EED creawxVTKRenderWindowInteractor::OnEraseBackground \n");
//turn off background erase to reduce flickering on MSW
event.Skip(false);
}
GetClientSize(&w, &h);
UpdateSize(w, h);
- if (!Enabled)
+ if (!Enabled)
{
return;
}
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
InvokeEvent(vtkCommand::ConfigureEvent, NULL);
#endif
//this will check for Handle
//---------------------------------------------------------------------------
void creawxVTKRenderWindowInteractor::OnMotion(wxMouseEvent &event)
{
- if (!Enabled)
+ if (!Enabled)
{
- return;
+ return;
}
-
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
- SetEventInformationFlipY(event.GetX(), event.GetY(),
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+ SetEventInformationFlipY(event.GetX(), event.GetY(),
event.ControlDown(), event.ShiftDown(), '\0', 0, NULL);
InvokeEvent(vtkCommand::MouseMoveEvent, NULL);
#if !(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1)
void creawxVTKRenderWindowInteractor::OnEnter(wxMouseEvent &event)
{
- if (!Enabled)
+ if (!Enabled)
{
return;
}
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
- SetEventInformationFlipY(event.GetX(), event.GetY(),
+ SetEventInformationFlipY(event.GetX(), event.GetY(),
event.ControlDown(), event.ShiftDown(), '\0', 0, NULL);
InvokeEvent(vtkCommand::EnterEvent, NULL);
#else
// old style
InteractorStyle->OnEnter(event.ControlDown(), event.ShiftDown(),
- event.GetX(), Size[1] - event.GetY() - 1);
+ event.GetX(), Size[1] - event.GetY() - 1);
#endif
}
//---------------------------------------------------------------------------
void creawxVTKRenderWindowInteractor::OnLeave(wxMouseEvent &event)
{
- if (!Enabled)
+ if (!Enabled)
{
return;
}
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
- SetEventInformationFlipY(event.GetX(), event.GetY(),
+ SetEventInformationFlipY(event.GetX(), event.GetY(),
event.ControlDown(), event.ShiftDown(), '\0', 0, NULL);
InvokeEvent(vtkCommand::LeaveEvent, NULL);
#else
// old style
InteractorStyle->OnLeave(event.ControlDown(), event.ShiftDown(),
- event.GetX(), Size[1] - event.GetY() - 1);
+ event.GetX(), Size[1] - event.GetY() - 1);
#endif
}
//---------------------------------------------------------------------------
void creawxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event)
{
- if (!Enabled)
+ if (!Enabled)
{
return;
}
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
int keycode = event.GetKeyCode();
char key = '\0';
- if (keycode < 256)
+ if (((unsigned int)keycode) < 256)
{
// TODO: Unicode in non-Unicode mode ??
key = (char)keycode;
}
- SetEventInformationFlipY(event.GetX(), event.GetY(),
- event.ControlDown(), event.ShiftDown(), key, 0, NULL);
-
+ // we don't get a valid mouse position inside the key event on every platform
+ // so we retrieve the mouse position explicitly and pass it along
+ wxPoint mousePos = ScreenToClient(wxGetMousePosition());
+ SetEventInformationFlipY(mousePos.x, mousePos.y,
+ event.ControlDown(), event.ShiftDown(), key, 0, NULL);
InvokeEvent(vtkCommand::KeyPressEvent, NULL);
- InvokeEvent(vtkCommand::CharEvent, NULL);
#else
- InteractorStyle->OnKeyDown(event.ControlDown(), event.ShiftDown(),
+ InteractorStyle->OnKeyDown(event.ControlDown(), event.ShiftDown(),
event.GetKeyCode(), 1);
#endif
event.Skip();
//---------------------------------------------------------------------------
void creawxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event)
{
- if (!Enabled)
+ if (!Enabled)
{
return;
}
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
int keycode = event.GetKeyCode();
char key = '\0';
- if (keycode < 256)
+ if (((unsigned int)keycode) < 256)
{
// TODO: Unicode in non-Unicode mode ??
key = (char)keycode;
}
- SetEventInformationFlipY(event.GetX(), event.GetY(),
- event.ControlDown(), event.ShiftDown(), key, 0, NULL);
+ // we don't get a valid mouse position inside the key event on every platform
+ // so we retrieve the mouse position explicitly and pass it along
+ wxPoint mousePos = ScreenToClient(wxGetMousePosition());
+ SetEventInformationFlipY(mousePos.x, mousePos.y,
+ event.ControlDown(), event.ShiftDown(), key, 0, NULL);
InvokeEvent(vtkCommand::KeyReleaseEvent, NULL);
#else
- InteractorStyle->OnKeyUp(event.ControlDown(), event.ShiftDown(),
+ InteractorStyle->OnKeyUp(event.ControlDown(), event.ShiftDown(),
event.GetKeyCode(), 1);
#endif
event.Skip();
}
#endif //!(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1)
+ //---------------------------------------------------------------------------
+void creawxVTKRenderWindowInteractor::OnChar(wxKeyEvent &event)
+{
+ if (!Enabled)
+ {
+ return;
+ }
+
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+ // new style
+ int keycode = event.GetKeyCode();
+ char key = '\0';
+ if (((unsigned int)keycode) < 256)
+ {
+ // TODO: Unicode in non-Unicode mode ??
+ key = (char)keycode;
+ }
+
+ // we don't get a valid mouse position inside the key event on every platform
+ // so we retrieve the mouse position explicitly and pass it along
+ wxPoint mousePos = ScreenToClient(wxGetMousePosition());
+ SetEventInformationFlipY(mousePos.x, mousePos.y,
+ event.ControlDown(), event.ShiftDown(), key, 0, NULL);
+ InvokeEvent(vtkCommand::CharEvent, NULL);
+#endif
+ event.Skip();
+}
//---------------------------------------------------------------------------
void creawxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event)
{
}
ActiveButton = event.GetEventType();
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
- SetEventInformationFlipY(event.GetX(), event.GetY(),
+ // On Mac (Carbon) and Windows we don't automatically get the focus when
+ // you click inside the window
+ // we therefore set the focus explicitly
+ // Apparently we need that on linux (GTK) too:
+ this->SetFocus();
+
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+ SetEventInformationFlipY(event.GetX(), event.GetY(),
event.ControlDown(), event.ShiftDown(), '\0', 0, NULL);
#endif
if(event.RightDown())
{
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
InvokeEvent(vtkCommand::RightButtonPressEvent, NULL);
-#else
+#else
// old style
InteractorStyle->OnRightButtonDown(event.ControlDown(), event.ShiftDown(),
event.GetX(), Size[1] - event.GetY() - 1);
}
else if(event.LeftDown())
{
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
InvokeEvent(vtkCommand::LeftButtonPressEvent, NULL);
-#else
+#else
// old style
InteractorStyle->OnLeftButtonDown(event.ControlDown(), event.ShiftDown(),
event.GetX(), Size[1] - event.GetY() - 1);
}
else if(event.MiddleDown())
{
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
InvokeEvent(vtkCommand::MiddleButtonPressEvent, NULL);
-#else
+#else
// old style
InteractorStyle->OnMiddleButtonDown(event.ControlDown(), event.ShiftDown(),
event.GetX(), Size[1] - event.GetY() - 1);
{
//EVT_xxx_DOWN == EVT_xxx_UP - 1
//This is only needed if two mouse buttons are pressed at the same time.
- //In wxWindows 2.4 and later: better use of wxMOUSE_BTN_RIGHT or
+ //In wxWindows 2.4 and later: better use of wxMOUSE_BTN_RIGHT or
//wxEVT_COMMAND_RIGHT_CLICK
- if (!Enabled || (ActiveButton != (event.GetEventType()-1)))
+ if (!Enabled || (ActiveButton != (event.GetEventType()-1)))
{
return;
}
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
- SetEventInformationFlipY(event.GetX(), event.GetY(),
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+ SetEventInformationFlipY(event.GetX(), event.GetY(),
event.ControlDown(), event.ShiftDown(), '\0', 0, NULL);
#endif
-
+
if(ActiveButton == wxEVT_RIGHT_DOWN)
{
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
InvokeEvent(vtkCommand::RightButtonReleaseEvent, NULL);
-#else
+#else
// old style
InteractorStyle->OnRightButtonUp(event.ControlDown(), event.ShiftDown(),
event.GetX(), Size[1] - event.GetY() - 1);
}
else if(ActiveButton == wxEVT_LEFT_DOWN)
{
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
InvokeEvent(vtkCommand::LeftButtonReleaseEvent, NULL);
-#else
+#else
// old style
InteractorStyle->OnLeftButtonUp(event.ControlDown(), event.ShiftDown(),
event.GetX(), Size[1] - event.GetY() - 1);
}
else if(ActiveButton == wxEVT_MIDDLE_DOWN)
{
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
// new style
InvokeEvent(vtkCommand::MiddleButtonReleaseEvent, NULL);
-#else
+#else
// old style
InteractorStyle->OnMiddleButtonUp(event.ControlDown(), event.ShiftDown(),
event.GetX(), Size[1] - event.GetY() - 1);
void creawxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event)
{
// Mouse wheel was only added after VTK 4.4 (I think...)
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2)
// new style
//Set vtk event information ... The numebr of wheel rotations is stored in
//the x varible. y varible is zero
- SetEventInformationFlipY(event.GetWheelRotation() / event.GetWheelDelta(), 0,
+ SetEventInformationFlipY(event.GetWheelRotation() / event.GetWheelDelta(), 0,
event.ControlDown(), event.ShiftDown(), '\0', 0, NULL);
if(event.GetWheelRotation() > 0)
{
//Send event to VTK
-// EED
-// InvokeEvent(vtkCommand::MouseWheelForwardEvent, NULL);
+ InvokeEvent(vtkCommand::MouseWheelForwardEvent, NULL);
}
else
{
//Send event to VTK
-// EED
-// InvokeEvent(vtkCommand::MouseWheelBackwardEvent, NULL);
+ InvokeEvent(vtkCommand::MouseWheelBackwardEvent, NULL);
}
#endif
-
+
}
//---------------------------------------------------------------------------
{
RenderWindow->Render();
}
-#if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2)
+#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2)
else if(GetHandleHack())
{
//this means the user has reparented us; let's adapt to the
//it does this by disabling all windows (disallowing user-input to
//prevent re-entrancy of code) and then handling all outstanding
//GUI events.
-
- //However, this often triggers an OnPaint() method for creawxVTKRWIs,
+
+ //However, this often triggers an OnPaint() method for wxVTKRWIs,
//resulting in a Render(), resulting in Update() being called whilst
//still in progress.
- RenderWhenDisabled = (bool)(newValue!=0);
+ RenderWhenDisabled = (bool)newValue;
}
//---------------------------------------------------------------------------
//
}
-#if defined(_WIN32)
-const char * creawxVTKRenderWindowInteractor::GetClassName() const
-{
- return "creawxVTKRenderWindowInteractor";
-}
-#endif //_WIN32
}
// LG : EO namespace
//=======================================================================
+
#endif // USE_WX
#endif // USE_VTK
git://git.creatis.insa-lyon.fr / crea.git / commitdiff