some memory leaks

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index 53b7f5ff317a9218d6f41adf87aba5b9a5c6c742..588a0dee2583ccd019abe86d182e1b9ea3828582 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/10/23 12:01:32 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2010/10/29 07:51:06 $
+  Version:   $Revision: 1.33 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -23,7 +23,6 @@
 //------------------------------------------------------------------------------------------------------------
 // Other includes
 //------------------------------------------------------------------------------------------------------------
-
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------
@@ -179,9 +178,10 @@
                        panelControl->SetSize(400,350);
                        panelControl->Layout();
                        //panelClipping3D->SetMinimumPaneSize( 5 );
-                       panelClipping3D->SetMinimumPaneSize( 100 );  // JPR
-
-                       panelClipping3D->SplitHorizontally( panelControl , window3D , 10  );
+                       panelClipping3D->SetMinimumPaneSize( 130 );  // FCY
+                       panelClipping3D->SplitHorizontally( panelControl , window3D , 0  );
+                       //panelClipping3D->SetSashSize(10);
+                       panelClipping3D->UpdateSize(); //FCY
                        wxwindow=panelClipping3D;
 
                        vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
@@ -213,7 +213,7 @@
                {
                   if (mvtkmprbasedata)         { delete mvtkmprbasedata;}
                }
-
+               
                if (mvtk2Dbaseview)             { delete mvtk2Dbaseview; }
                if (mvtkmpr2Dview_X)            { delete mvtkmpr2Dview_X;}
                if (mvtkmpr2Dview_Y)            { delete mvtkmpr2Dview_Y;}
@@ -224,6 +224,7 @@
                if (mwxvtkmpr3Dview)            { delete mwxvtkmpr3Dview;}
                if (mwxvtkclipping3Dview)       { delete mwxvtkclipping3Dview;}
                if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;}
+               if (vtkmpr3Ddataviewer)                 { delete vtkmpr3Ddataviewer;}
        }
        //------------------------------------------------------------------------------------------------------------
        // Methods