X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=031ee43a5a1bc55a8d488eff64a6a09c97eed4c0;hb=03cc68dd6b831aa98e1e0fad20a977ffa074be39;hp=ae431dc9cb1cd6570949f29e969dc2a6d720e067;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx
index ae431dc..031ee43 100644
--- a/kernel/src/bbtkWxGUIConsole.cxx
+++ b/kernel/src/bbtkWxGUIConsole.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIConsole.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:15 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.18 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 /**
@@ -169,7 +176,8 @@ namespace bbtk
 
         
     // Set the parent window of all bbtk windows as a child of this
-    bbtk::Wx::SetTopWindowParent(this);
+    //    bbtk::Wx::SetTopWindowParent(this);
+    bbtk::Wx::SetTopWindow(this);
     // Top Window Auto Destroys when no more black box window alive 
     // : this is the default 
     //    bbtk::Wx::SetAutoDestroyTopWindow(true);
@@ -199,12 +207,36 @@ namespace bbtk
   }
   //================================================================
 
+  //================================================================
+  void WxGUIConsole::OnClose(wxCloseEvent& event)
+  {
+    bbtkDebugMessage("widget",9,"bbi::OnClose()"<<std::endl);
+    //Wx::SetWindowsHaveBeenDestroyedByParent();
+    //mInterpreter.reset();
+    wxWindowList& list = GetChildren();
+    wxWindowList::iterator iter;
+    for (iter = list.begin(); iter != list.end(); ++iter)
+      {
+	(*iter)->Close();
+      }
+    this->Destroy();
+  }
+  //================================================================
+
   //================================================================
   void WxGUIConsole::OnWxSignal()
   {
-    if ((!Wx::TopWindowExists())&&(!IsShown())) 
+    if ((!bbtk::Wx::IsSomeWindowAlive())&&(!IsShown())) 
       {
 	bbtkDebugMessage("wx",2,"  --> bbtk top window destroyed and WxGUIConsole not shown => destructing"<<std::endl);
+	/*
+	wxWindowList& list = GetChildren();
+	wxWindowList::iterator iter;
+	for (iter = list.begin(); iter != list.end(); ++iter)
+	  {
+	    (*iter)->Close();
+	  }
+	*/
 	Close();
       }
   }
@@ -278,7 +310,7 @@ namespace bbtk
   {
     m_mgr.Update();
 	Refresh();
-    wxMessageBox(_T("  bbi\nThe Black Box Toolkit interpreter\n(c) CREATIS-LRMN 2008"),
+    wxMessageBox(_T("  bbi\nThe Black Box Toolkit interpreter\n(c) CREATIS 2008"),
                  _T("About ..."), wxOK | wxICON_INFORMATION,
                  this);
   }
@@ -428,15 +460,17 @@ namespace bbtk
   
   //================================================================  
   // Overloaded Show method to handle bbtk::Wx::TopWindow auto-destruction
+  // OBSOLETE !!!
   bool WxGUIConsole::Show(bool show)
   {
-    bbtk::Wx::SetAutoDestroyTopWindow(!show);
+    //    bbtk::Wx::SetAutoDestroyTopWindow(!show);
     return wxFrame::Show(show);
   }
   //================================================================  
    
   //================================================================  
   BEGIN_EVENT_TABLE(WxGUIConsole, wxFrame)
+    EVT_CLOSE(  WxGUIConsole::OnClose)
     EVT_MENU(ID_Menu_Quit			, WxGUIConsole::OnMenuQuit)
     EVT_MENU(ID_Menu_About			, WxGUIConsole::OnMenuAbout)
     EVT_MENU(ID_Menu_EditConfig		, WxGUIConsole::OnMenuEditConfig)