X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxGimmickFrame.cpp;h=bbdf22668a9e51fde3fddfdc9f696506b11acaed;hb=34d2d6b1860321978fd19668bbf6fd0606ac1e80;hp=d0e04fe99c01631eae056e3ed5a23b7fb6be1faf;hpb=4c2b3017f90a93165a5f436f4f546096a36e0fb1;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickFrame.cpp b/src2/creaImageIOWxGimmickFrame.cpp
index d0e04fe..bbdf226 100644
--- a/src2/creaImageIOWxGimmickFrame.cpp
+++ b/src2/creaImageIOWxGimmickFrame.cpp
@@ -16,13 +16,13 @@ namespace creaImageIO
 		  pos,
 		  size,
 		  wxRESIZE_BORDER | 
-	      //  wxSYSTEM_MENU  |
+	      wxSYSTEM_MENU  |
 		  wxCLOSE_BOX |
 		  wxMAXIMIZE_BOX | 
 		  wxMINIMIZE_BOX | 
 		  wxCAPTION  
 	       ),
-     mGimmick(0),
+    // mGimmick(0),
      mView(0)
   {
     GimmickDebugMessage(1,"WxGimmickFrame::WxGimmickFrame"
@@ -31,16 +31,18 @@ namespace creaImageIO
     
     try {
       
-      mGimmick = new Gimmick();
+   //   mGimmick = new Gimmick();
       mGimmick->Initialize();
      
-      int image_type = GIMMICK_3D_IMAGE_SELECTION;
+      int min_dim = GIMMICK_2D_IMAGE_SELECTION;
+	  int max_dim = GIMMICK_3D_IMAGE_SELECTION;
       mView = new WxGimmickView(mGimmick,
 				this,
 				-1,
 				wxDefaultPosition,
 				size,
-				image_type,
+				min_dim,
+				max_dim,
 				threads);
       mView->Initialize();
     }
@@ -68,7 +70,7 @@ namespace creaImageIO
     if (mGimmick) 
       {
 	mGimmick->Finalize();
-	delete mGimmick;
+//	delete mGimmick;
       }
   }