X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWx.h;h=d810bbf528a03d43e4722e49abc36514e27eec63;hb=6ac9074f717f22c4ffdc6a70d0704c1b1f8fe842;hp=b2ed350963d3a5bbfdc59ecd94b9915d12921986;hpb=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;p=bbtk.git diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h index b2ed350..d810bbf 100644 --- a/kernel/src/bbtkWx.h +++ b/kernel/src/bbtkWx.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWx.h,v $ Language: C++ - Date: $Date: 2008/12/11 15:30:04 $ - Version: $Revision: 1.9 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.12 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -26,30 +26,7 @@ * * 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__ @@ -80,6 +57,7 @@ // define wxWindow typedef void wxWindow; +typedef void wxBusyCursor; #endif // EO USE_WXWIDGETS //=========================================================================== @@ -119,14 +97,6 @@ namespace bbtk 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,42 +105,31 @@ 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