X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreawxVTKRenderWindowInteractor.cxx;h=4f6a0bb28b6638cf580728394d25c7a6a401a9f9;hb=fbe2c10bce301f4532a1eaed60df329889c300d5;hp=e8206e72bba407492f56342049e375c6858b5358;hpb=ffbaf4177cae0647c558f89daf6783b91373930d;p=crea.git

diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx
index e8206e7..4f6a0bb 100644
--- a/src/creawxVTKRenderWindowInteractor.cxx
+++ b/src/creawxVTKRenderWindowInteractor.cxx
@@ -3,8 +3,8 @@
   Program:   Visualization Toolkit
   Module:    $RCSfile: creawxVTKRenderWindowInteractor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/15 11:19:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/10/05 19:41:56 $
+  Version:   $Revision: 1.5 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -15,6 +15,8 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
+#ifdef USE_WXWIDGETS
+#ifdef USE_VTK
 
 #include "creawxVTKRenderWindowInteractor.h"
 
@@ -158,7 +160,7 @@ creawxVTKRenderWindowInteractor::creawxVTKRenderWindowInteractor(wxWindow *paren
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
       : vtkRenderWindowInteractor(), wxGLCanvas(parent, id, pos, size, style, name)
 #else
-      : vtkRenderWindowInteractor(), wxWindow(parent, id, pos, size, style, name)
+      : wxWindow(parent, id, pos, size, style, name), vtkRenderWindowInteractor()
 #endif //__WXGTK__
       , timer(this, ID_creawxVTKRenderWindowInteractor_TIMER)
       , ActiveButton(wxEVT_NULL)
@@ -702,7 +704,7 @@ void creawxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue)
   //resulting in a Render(), resulting in Update() being called whilst
   //still in progress.
 
-  RenderWhenDisabled = (bool)newValue;
+  RenderWhenDisabled = (bool)(newValue!=0);
 }
 //---------------------------------------------------------------------------
 //
@@ -740,3 +742,5 @@ const char * creawxVTKRenderWindowInteractor::GetClassName() const
 // LG : EO namespace 
 //=======================================================================
 
+#endif // USE_WX
+#endif // USE_VTK