*** empty log message ***

[bbtk.git] / packages / wxvtk / src / bbwxvtkViewer2D.cxx

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index e28a457f7951757d72c3da2ef4d0f74e086191f4..ebf62d1ea2632a00305690f64a7be783302df6f5 100644 (file)
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/20 16:32:41 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2008/11/24 15:45:53 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -260,11 +260,14 @@ namespace bbwxvtk
     // (see wxvtk/bbs/appli/ExampleSimpleSlicer)
     // I think there is a problem with rendering before window 
     // has been reparented ... we have to check this 
-
-    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
-    bbSetOutputOut( bbGetInputSlice() );
-    bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
-       
+         Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget(); 
+    if (w)
+       {
+               w->UpdateView();
+               bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
+       }
+         bbSetOutputOut( bbGetInputSlice() );
+         
   }
   
 
@@ -272,6 +275,7 @@ namespace bbwxvtk
   {
     bbSetInputIn(NULL);
     bbSetInputSlice(0);
+         bbSetOutputWidget(0);
     bbSetInputOrientation(0);
   }
 
@@ -280,11 +284,11 @@ namespace bbwxvtk
    *
    *
    */ 
-  void Viewer2D::CreateWidget()
+  void Viewer2D::CreateWidget(wxWindow* parent)
   {
     bbtkDebugMessageInc("Core",9,"Viewer2D::CreateWidget()"<<std::endl);
 
-    Viewer2DWidget* w = new Viewer2DWidget(this,bbGetWxParent());
+         Viewer2DWidget* w = new Viewer2DWidget(this,parent);//bbGetWxParent());
     bbSetOutputWidget(w);
 
     bbtkDebugDecTab("Core",9);