X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=031ee43a5a1bc55a8d488eff64a6a09c97eed4c0;hb=f5ee1c433d1c86bc0aa11fdaba7aa891cbad9b8a;hp=53cbb2fdc4d40f0a7d0c7b88971600c71aae6309;hpb=d8041d1ef54a73acc2306557435f6b04edf60daf;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx index 53cbb2f..031ee43 100644 --- a/kernel/src/bbtkWxGUIConsole.cxx +++ b/kernel/src/bbtkWxGUIConsole.cxx @@ -1,20 +1,42 @@ +/* + # --------------------------------------------------------------------- + # + # 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/05/06 13:45:12 $ - Version: $Revision: 1.11 $ - - 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: 2012/11/16 08:49:01 $ + Version: $Revision: 1.18 $ +=========================================================================*/ + + + + +/** * \brief Short description in one line * * Long description which @@ -153,8 +175,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 +207,36 @@ namespace bbtk } //================================================================ + //================================================================ + void WxGUIConsole::OnClose(wxCloseEvent& event) + { + bbtkDebugMessage("widget",9,"bbi::OnClose()"<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"<Close(); + } + */ Close(); } } @@ -260,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); } @@ -287,7 +337,7 @@ namespace bbtk //================================================================ void WxGUIConsole::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event)) { - std::string command("toolsbbtk/appli/CreatePackage"); + std::string command("toolsbbtk/appli/GUICreatePackage"); bbtkMessage("Debug",1,"Executing : '"<InterpretFile(command); @@ -371,7 +421,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 +460,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)