X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWx.h;h=52eca34bd2365486c8308aeb7ecd4835cf86353b;hb=f5ee1c433d1c86bc0aa11fdaba7aa891cbad9b8a;hp=0a388e5afd4a0a16a02cb350d10f6455f592fb9a;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h index 0a388e5..52eca34 100644 --- a/kernel/src/bbtkWx.h +++ b/kernel/src/bbtkWx.h @@ -1,55 +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: bbtkWx.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:14 $ - Version: $Revision: 1.8 $ + Date: $Date: 2012/11/16 08:49:01 $ + Version: $Revision: 1.13 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* 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. -* ------------------------------------------------------------------------ */ - - -/* --------------------------------------------------------------------- - -* 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. -* ------------------------------------------------------------------------ */ + #ifndef __bbtkWx_h_INCLUDED__ @@ -57,7 +41,7 @@ //=========================================================================== // Wx headers -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #include @@ -76,12 +60,13 @@ #endif //__WXGTK__ // EO Wx headers -#else //_USE_WXWIDGETS_ +#else //USE_WXWIDGETS // define wxWindow typedef void wxWindow; +typedef void wxBusyCursor; -#endif // EO _USE_WXWIDGETS_ +#endif // EO USE_WXWIDGETS //=========================================================================== //=========================================================================== @@ -92,7 +77,7 @@ typedef void wxWindow; // SIGNAL/SLOT MECHANISM // FOR bbtk WINDOWS CREATION/DESTRUCTION OBSERVATION // BBTKWXSIG -#include +#include #include // \BBTKWXSIG //=========================================================================== @@ -114,19 +99,11 @@ namespace bbtk { public: // BBTKWXSIG - typedef boost::signals::trackable SignalObserver; - typedef boost::signal Signal_type; + typedef boost::signals2::trackable SignalObserver; + typedef boost::signals2::signal Signal_type; typedef Signal_type::slot_function_type Slot_function_type; // \BBTKWXSIG - /* - static void ResetCursor(); - static void BeginBusyCursor(); - static void EndBusyCursor(); - */ - - static void LoopUntilAllWindowsClose(); - class BusyCursor { public: @@ -135,45 +112,34 @@ namespace bbtk wxBusyCursor* mCursor; }; - static void SetTopWindowParent(wxWindow*); - static void SetAutoDestroyTopWindow(bool); - - /// Returns the creation time parent of all bbtk windows - /// (window can be reparented after creation) - static wxWindow* GetTopWindow(); - static bool TopWindowExists(); + static void ProcessPendingEvents(); + /// Sets the parent of all bbtk windows + static void SetTopWindow(wxWindow*); + /// Returns the parent of all bbtk windows + static wxWindow* GetTopWindow(); + + static void IncNbWindowsAlive(); static void DecNbWindowsAlive(); static int GetNbWindowsAlive(); static bool IsSomeWindowAlive(); - static void IncNbWindowsShown(); - static void DecNbWindowsShown(); - static int GetNbWindowsShown(); - static bool IsSomeWindowShown(); - - // BBTKWXSIG + // BBTKWXSIG static void AddSignalObserver(Slot_function_type); // \BBTKWXSIG + private: static void CreateWxAppIfNeeded(); static void DestroyWxAppIfNeeded(); - static void CreateTopWindowIfNeeded(); - static void DestroyTopWindowIfNeeded(); - - /// Sets the creation time parent of all bbtk windows - static void SetTopWindow(wxWindow*); }; // struct Wx //================================================================== - - -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS //================================================================== /// Conversion std::string to wxString inline wxString std2wx(const std::string& s){