#3394 wxwidgets 3.2 macOS

[crea.git] / src / creawxVTKRenderWindowInteractor.mm

diff --git a/src/creawxVTKRenderWindowInteractor.mm b/src/creawxVTKRenderWindowInteractor.mm
index 578c3a36ac4a925008d8b224af635a1928211fed..33f4e84002409d8f58ae5eb0f438765da9699652 100644 (file)
--- a/src/creawxVTKRenderWindowInteractor.mm
+++ b/src/creawxVTKRenderWindowInteractor.mm
@@ -44,7 +44,6 @@
 =========================================================================*/
 
 
-
 #include <assert.h>
 
 #include "creawxVTKRenderWindowInteractor.h"
@@ -54,6 +53,7 @@
 #  include "vtkVersion.h"
 #endif
 
+
 #if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0)
 #  include "vtkCommand.h"
 #else
@@ -82,8 +82,7 @@
 
 
 #ifdef VTK_USE_TDX
-// #import "vtkTDxMacDevice.h"
-#import "/Users/davila/Creatis/C11/tpli/include/vtk-8.2/vtkTDxMacDevice.h"
+#import "vtkTDxMacDevice.h"
 #endif
 
 
@@ -108,12 +107,16 @@ wxWindow* wxGetTopLevelParent(wxWindow *win)
 
 // To access objc calls on cocoa
 #ifdef __WXCOCOA__
-#ifdef VTK_USE_COCOA
-// This trick is no longer need in VTK CVS, should get rid of that:
+
 #define id Id
-#else
-#error Build mismatch you need both wxWidgets and VTK to be configure against Cocoa to work
-#endif //VTK_USE_COCOA
+
+// #ifdef VTK_USE_COCOA
+// // This trick is no longer need in VTK CVS, should get rid of that:
+// #define id Id
+// #else
+// #error Build mismatch you need both wxWidgets and VTK to be configure against Cocoa to work
+// #endif //VTK_USE_COCOA
+
 #endif //__WXCOCOA__
 
 #if wxMAJOR_VERSION <= 2
@@ -267,6 +270,7 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor()
       , RenderWhenDisabled(1)
       , UseCaptureMouse(0)
 {
+    
 #ifdef VTK_DEBUG_LEAKS
   vtkDebugLeaks::ConstructClass("wxVTKRenderWindowInteractor");
 #endif
@@ -281,7 +285,6 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor()
     this->Device=vtkTDxMacDevice::New();
 #endif
 
-    
 }
 //---------------------------------------------------------------------------
 wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent,
@@ -308,6 +311,7 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent,
       , RenderWhenDisabled(1)
       , UseCaptureMouse(0)
 {
+        
 #ifdef VTK_DEBUG_LEAKS
   vtkDebugLeaks::ConstructClass("wxVTKRenderWindowInteractor");
 #endif
@@ -328,8 +332,8 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent,
     this->Device=vtkTDxMacDevice::New();
 #endif
 
-    
 }
+
 //---------------------------------------------------------------------------
 wxVTKRenderWindowInteractor::~wxVTKRenderWindowInteractor()
 {
@@ -342,14 +346,15 @@ wxVTKRenderWindowInteractor::~wxVTKRenderWindowInteractor()
 #ifdef VTK_USE_TDX
   this->Device->Delete();
 #endif
-
 }
+
 //---------------------------------------------------------------------------
 wxVTKRenderWindowInteractor * wxVTKRenderWindowInteractor::New()
 {
   // we don't make use of the objectfactory, because we're not registered
   return new wxVTKRenderWindowInteractor;
 }
+
 //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::Initialize()
 {
@@ -357,13 +362,11 @@ void wxVTKRenderWindowInteractor::Initialize()
   // enable everything and start rendering
   Enable();
   //RenderWindow->Start();
-
   // set the size in the render window interactor
   Size[0] = size[0];
   Size[1] = size[1];
-
   // this is initialized
-  Initialized = 1;
+    Initialized = 1;
 }
 //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::Enable()
@@ -387,14 +390,12 @@ void wxVTKRenderWindowInteractor::Enable()
   }
 #endif
 
-    
-    
   Modified();
+    
 }
 //---------------------------------------------------------------------------
 bool wxVTKRenderWindowInteractor::Enable(bool enable)
 {
-    
 #ifdef VTK_USE_TDX
   if(this->UseTDx)
   {
@@ -403,8 +404,6 @@ bool wxVTKRenderWindowInteractor::Enable(bool enable)
   }
 #endif
 
-    
-    
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
   return wxGLCanvas::Enable(enable);
 #else
@@ -416,8 +415,9 @@ void wxVTKRenderWindowInteractor::Disable()
 {
   // if already disabled then done
   if (!Enabled)
+  {
     return;
-
+  }
 #ifdef VTK_USE_TDX
   if(this->Device->GetInitialized())
   {
@@ -451,9 +451,9 @@ void wxVTKRenderWindowInteractor::UpdateSize(int x, int y)
       // and our RenderWindow's size
 
 #ifdef __WXCOCOA__
-  #ifdef VTK_USE_COCOA
-  #else
-  #endif //VTK_USE_COCOA
+//  #ifdef VTK_USE_COCOA
+//  #else
+//  #endif //VTK_USE_COCOA
 #else
       RenderWindow->SetSize(x, y);
 #endif //__WXCOCOA__
@@ -469,19 +469,21 @@ int wxVTKRenderWindowInteractor::CreateTimer(int WXUNUSED(timertype))
 {
   // it's a one shot timer
   if (!timer.Start(10, TRUE))
+  {
     return 0;
-
+  }
   return 1;
-  
 }
+
 #if VTK_MAJOR_VERSION > 5 || (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 2)
 //------------------------------------------------------------------
 int wxVTKRenderWindowInteractor::InternalCreateTimer(int timerId, int timerType,
                                                      unsigned long duration)
 {
   if (!timer.Start(duration, timerType == OneShotTimer))
+  {
     return 0;
-    
+  }
   return ID_wxVTKRenderWindowInteractor_TIMER;
 }
 //------------------------------------------------------------------
@@ -491,12 +493,14 @@ int wxVTKRenderWindowInteractor::InternalDestroyTimer(int platformTimerId)
   return 1;
 }
 #endif
+
 //---------------------------------------------------------------------------
 int wxVTKRenderWindowInteractor::DestroyTimer()
 {
   // do nothing
   return 1;
 }
+
 //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::OnTimer(wxTimerEvent& WXUNUSED(event))
 {
@@ -630,6 +634,7 @@ void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event))
   }
 #endif
 #endif
+    
 }
 //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::OnEraseBackground(wxEraseEvent &event)
@@ -716,7 +721,7 @@ void wxVTKRenderWindowInteractor::OnLeave(wxMouseEvent &event)
 //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event)
 {
-  if (!Enabled) 
+  if (!Enabled)
     {
     return;
     }
@@ -746,7 +751,7 @@ void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event)
 //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event)
 {
-  if (!Enabled) 
+  if (!Enabled)
     {
     return;
     }
@@ -777,7 +782,7 @@ void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event)
  //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::OnChar(wxKeyEvent &event)
 {
-  if (!Enabled) 
+  if (!Enabled)
     {
     return;
     }
@@ -944,7 +949,7 @@ void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event)
       InvokeEvent(vtkCommand::MouseWheelBackwardEvent, NULL);
     }
 #endif
-    
+
 }
 
 //---------------------------------------------------------------------------
@@ -983,7 +988,7 @@ void wxVTKRenderWindowInteractor::Render()
       //if it's not enabeld, renderAllowed will be false
       renderAllowed = topParent->IsEnabled();
       }
-    }
+    } // if renderAllowed && !RenderWhenDisabled
 
   if (renderAllowed)
     {
@@ -1006,8 +1011,7 @@ void wxVTKRenderWindowInteractor::Render()
       RenderWindow->Render();
       }
 #endif
-
-    }
+    } // if renderAllowed
 }
 //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue)