*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVTKRenderWindowInteractor.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
index b2340f6610666902c78b55fe4f7c7abf271882bb..e337fb64c7346fc33fb27192ae98eacb52d280b3 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
@@ -3,8 +3,8 @@
   Program:   Visualization Toolkit
   Module:    $RCSfile: wxVTKRenderWindowInteractor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:44 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/10/04 05:18:13 $
+  Version:   $Revision: 1.5 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -351,6 +351,7 @@ void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event))
   //std::cout << "wxVTKRenderWindowInteractor::OnPaint"<<std::endl;
   Render();
 
+ //  this->Refresh();
 #if defined(__WXGTK__) && defined(USE_WXGLCANVAS)
   //  bbtkDebugMessage("Core",9,"wxVTKRenderWindowInteractor::OnPaint   public wxGLCanvas, virtual public vtkRenderWindowInteractor  \n");
 #else
@@ -540,6 +541,7 @@ void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event)
 //---------------------------------------------------------------------------
 void wxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event)
 {
+       
   if (!Enabled || (ActiveButton != wxEVT_NULL))
     {
     return;
@@ -677,7 +679,7 @@ void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event)
 }
 
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::Render()
+void wxVTKRenderWindowInteractor::Render() throw (char*)
 {
   RenderAllowed = 1;
   if (!RenderWhenDisabled)
@@ -697,7 +699,11 @@ void wxVTKRenderWindowInteractor::Render()
     {
     if(Handle && (Handle == GetHandleHack()) )
       {
-      RenderWindow->Render();
+                 if(RenderWindow!=NULL){
+                       RenderWindow->Render();
+                 }else{
+                         throw "wxVTKRenderWindowInteractor::Render(){RenderWindow not set}";
+                 }
       }
 #if VTK_MAJOR_VERSION == 5 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2)
     else if(GetHandleHack())
@@ -705,10 +711,12 @@ void wxVTKRenderWindowInteractor::Render()
       //this means the user has reparented us; let's adapt to the
       //new situation by doing the WindowRemap dance
       //store the new situation
-      Handle = GetHandleHack();
-      RenderWindow->SetNextWindowId(reinterpret_cast<void *>(Handle));
-      RenderWindow->WindowRemap();
-      RenderWindow->Render();
+                 if(RenderWindow!=NULL){
+                       Handle = GetHandleHack();
+                       RenderWindow->SetNextWindowId(reinterpret_cast<void *>(Handle));
+                       RenderWindow->WindowRemap();
+                       RenderWindow->Render();
+                 }
       }
 #endif
     }