X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=de9ce1d4e7d124aef64cfc615f8b426baa3cf33e;hb=4234999264604da013c2574feef3816c75b3034e;hp=37bfe4d3758d12b7595d420809846126098e0045;hpb=f993478d7df1d9688c4ab93c617688c84cf2d424;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 37bfe4d..de9ce1d 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/14 12:32:26 $
-  Version:   $Revision: 1.19 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/17 08:18:14 $
+  Version:   $Revision: 1.27 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 #ifdef _USE_WXWIDGETS_
 
 
@@ -93,6 +106,11 @@ namespace bbtk
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxWindow::bbClose()
+  {
+  }
+  //=========================================================================
 
 
   //=========================================================================
@@ -105,7 +123,6 @@ namespace bbtk
 				     wxString title,
 				     wxSize size)
     :
-    WxBlackBoxWindow(box),
     wxDialog( parent, 
 		-1, 
 		title,
@@ -117,7 +134,8 @@ namespace bbtk
 		wxMAXIMIZE_BOX | 
 		wxMINIMIZE_BOX | 
 		wxCAPTION  
-		)
+	      ),
+    WxBlackBoxWindow(box)
   {
     bbtkDebugMessage("wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
@@ -136,11 +154,12 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxDialog::bbShow()
   { 
+    if (bbIsShown()) return;
     bbtkDebugMessage("wx",5,"WxBlackBoxDialog::bbShow() ["
 		     <<bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
     WxBlackBoxWindow::bbShow();
     SetReturnCode( wxDialog::ShowModal() ); 
-    bbHide();
+    bbClose();
   }
   //=========================================================================
 
@@ -153,6 +172,14 @@ namespace bbtk
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxDialog::bbClose()
+  {
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::bbClose()"<<std::endl);
+    wxDialog::Destroy();
+  }
+  //=========================================================================
+
   //=========================================================================
   WxBlackBoxDialog::~WxBlackBoxDialog()
   {
@@ -172,8 +199,7 @@ namespace bbtk
 				   wxWindow *parent,
 				   wxString title,
 				   wxSize size)
-    : WxBlackBoxWindow(box),
-      wxFrame( parent, 
+    :  wxFrame( parent, 
 	       -1, 
 	       title,
 	       wxDefaultPosition,
@@ -184,7 +210,8 @@ namespace bbtk
 	       wxMAXIMIZE_BOX | 
 	       wxMINIMIZE_BOX | 
 	       wxCAPTION  
-	       )
+		),
+       WxBlackBoxWindow(box)
   {
     bbtkDebugMessage("wx",9,"WxBlackBoxFrame::WxBlackBoxFrame("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
@@ -211,16 +238,23 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxFrame::bbShow() 
   { 
+    if (bbIsShown()) return;
     bbtkDebugMessage("wx",5,"WxBlackBoxFrame::bbShow("
 		     <<bbGetBlackBox()->bbGetFullName()<<")"<<std::endl);
     WxBlackBoxWindow::bbShow();
-    wxFrame::Show();
+  wxFrame::Show();
     // This Update is ** MANDATORY ** 
     // to synchronize wxvtkRenderWindowInteractor objects
     // (force wx objects creation **NOW**)
-    wxFrame::Update();
+
+
+#if defined(_WIN32)
+      wxFrame::Refresh();
+#endif
+
+      wxFrame::Update();
+      wxFrame::SetFocus();
     if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();
-    //    wxFrame::SetFocus();
   }
   //=========================================================================
 
@@ -234,6 +268,13 @@ namespace bbtk
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxFrame::bbClose()
+  {
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::bbClose()"<<std::endl);
+    wxFrame::Close();
+  }
+  //=========================================================================
 
 
 
@@ -458,7 +499,8 @@ namespace bbtk
 	if ((caller==0) ||
 	    ((caller!=0) && 
 	     (caller->GetBlackBoxTo() != to))&&
-	    (!bbGetUpdateTransferedToParent()))
+	    (!bbGetUpdateTransferedToParent())&&
+	    (to->bbGetStatus()!=UPDATING))
 	  {
 	    bbtkDebugMessage("process",3,
 			     "   ... Transfering update order to parent"
@@ -645,6 +687,19 @@ namespace bbtk
   //==================================================================
 
 
+  //==================================================================
+   void WxBlackBox::bbCloseWindow()
+  {
+    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbCloseWindow() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+
+    if (bbGetWindow()!=0) bbGetWindow()->bbClose();
+
+    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbCloseWindow() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+  }
+  //==================================================================
+
   //==================================================================
   WxBlackBox::Window* WxBlackBox::bbGetContainingWindow()
   {