X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=8f3c4e80452d361d2f0b6d3d3357184bfd81e029;hb=ca35bb0588533c9eac29b7d3ef8689c97ccfcfe7;hp=8d04582120ac4af9cb7026d3c1aba777c7267658;hpb=857e5e5bd003d20cb8bc4539b6fca4ca9d50929c;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx
index 8d04582..8f3c4e8 100644
--- a/kernel/src/bbtkWxGUIConsole.cxx
+++ b/kernel/src/bbtkWxGUIConsole.cxx
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIConsole.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/15 08:02:36 $
-  Version:   $Revision: 1.12 $
-                                                                                
-  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: 2009/05/28 08:12:06 $
+  Version:   $Revision: 1.16 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -153,8 +168,12 @@ namespace bbtk
     cmdsizer->Add (mWxGUICommand, 0, wxALL | wxGROW, 5);
 
         
-    // Creates the parent window of all bbtk windows as a child of this
-    Wx::CreateTopWindow(this,true);
+    // Set the parent window of all bbtk windows as a child of 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);
     // Add the method OnWxSignal as a Wx::Signal observer 
     bbtkAddWxSignalObserver(WxGUIConsole::OnWxSignal);
 
@@ -181,12 +200,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();
       }
   }
@@ -371,7 +414,7 @@ namespace bbtk
 	std::string strcommand0		= "cd "+bbdoc_path+" && mkdir tmp && cd tmp";
 
 	std::string strcommand1		= "cd "+bbdoc_path+"/tmp";
-    std::string strcommand2		= "\""+bin_path+"/bbi\" -n "+make_index_path;
+    std::string strcommand2		= "\""+bin_path+"/bbi\" -N "+make_index_path;
 #ifdef WIN32 
     std::string strcommand3		= "move index*.html ../.";
 #else
@@ -410,15 +453,17 @@ namespace bbtk
   
   //================================================================  
   // Overloaded Show method to handle bbtk::Wx::TopWindow auto-destruction
+  // OBSOLETE !!!
   bool WxGUIConsole::Show(bool show)
   {
-    Wx::AutoDestroyTopWindow(!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)