X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVTKRenderWindowInteractor.cxx;h=9c313b558d4a29683686f73eb5ba669cc0329cb2;hb=37319ea6defbf2dc5ddce23e0b65c2247543ae33;hp=b2340f6610666902c78b55fe4f7c7abf271882bb;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
index b2340f6..9c313b5 100644
--- 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: 2009/05/14 13:54:35 $
+  Version:   $Revision: 1.3 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -677,7 +677,7 @@ void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event)
 }
 
 //---------------------------------------------------------------------------
-void wxVTKRenderWindowInteractor::Render()
+void wxVTKRenderWindowInteractor::Render() throw (char*)
 {
   RenderAllowed = 1;
   if (!RenderWhenDisabled)
@@ -697,7 +697,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 +709,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
     }