#3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7

[bbtk.git] / packages / wxvtk / src / wxVTKRenderWindowInteractor.h

diff --git a/packages/wxvtk/src/wxVTKRenderWindowInteractor.h b/packages/wxvtk/src/wxVTKRenderWindowInteractor.h
index 12f33f88b272156d3ebb14bed6576f387548c589..2487c23594e7ddb79dcf52e4d799cfc474268381 100644 (file)
--- a/packages/wxvtk/src/wxVTKRenderWindowInteractor.h
+++ b/packages/wxvtk/src/wxVTKRenderWindowInteractor.h
@@ -127,7 +127,14 @@ class wxVTKRenderWindowInteractor : public wxWindow, public vtkRenderWindowInter
                                 const wxSize &size = wxDefaultSize,
                                 long style = wxWANTS_CHARS | wxNO_FULL_REPAINT_ON_RESIZE,
                                 const wxString &name = wxPanelNameStr);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     vtkTypeRevisionMacro(wxVTKRenderWindowInteractor,vtkRenderWindowInteractor);
+#else
+    vtkTypeMacro(wxVTKRenderWindowInteractor,vtkRenderWindowInteractor);
+#endif
+
     static wxVTKRenderWindowInteractor * New();
     void PrintSelf(ostream& os, vtkIndent indent);
 
@@ -141,8 +148,8 @@ class wxVTKRenderWindowInteractor : public wxWindow, public vtkRenderWindowInter
     void Disable();
     void Start();
     void UpdateSize(int x, int y);
-    int CreateTimer(int timertype);
-    int DestroyTimer();
+    int  CreateTimer(int timertype);
+    int  DestroyTimer();
     void TerminateApp() {};
 
     // event handlers
@@ -181,17 +188,17 @@ class wxVTKRenderWindowInteractor : public wxWindow, public vtkRenderWindowInter
     vtkBooleanMacro(UseCaptureMouse,int);
 
   protected:
-    wxTimer timer;
-    int ActiveButton;
-    int RenderAllowed;
-    long GetHandleHack();
-    int Stereo;
+    wxTimer    timer;
+    int        ActiveButton;
+    int                RenderAllowed;
+    long       GetHandleHack();
+    int        Stereo;
     
   private:
-    long Handle;
-    bool Created;
-    int RenderWhenDisabled;
-    int UseCaptureMouse;
+    long       Handle;
+    bool       Created;
+    int        RenderWhenDisabled;
+    int        UseCaptureMouse;
 
     DECLARE_EVENT_TABLE()
 };