X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWx.h;h=13bc15ad2ff32de2ff42b19d04557774959974bb;hb=f45b7f05b03f411759981fe13645466a1c289e6a;hp=d3f3318f86bd3a854ad93d266d743ebb3320e20a;hpb=97b08ef9b0c2a60c4d1f619f6bfef2996afdcab3;p=bbtk.git

diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h
index d3f3318..13bc15a 100644
--- a/kernel/src/bbtkWx.h
+++ b/kernel/src/bbtkWx.h
@@ -1,9 +1,63 @@
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbtkWx.h,v $
+  Language:  C++
+  Date:      $Date: 2009/05/28 08:12:06 $
+  Version:   $Revision: 1.11 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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__
 #define __bbtkWx_h_INCLUDED__
 
 //===========================================================================
 // Wx headers
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 #include <wx/datetime.h>
@@ -22,12 +76,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
 //===========================================================================
 
 //===========================================================================
@@ -54,6 +109,8 @@ namespace bbtk
   Wx::AddSignalObserver(boost::bind(&METHOD, this))
 // \BBTKWXSIG
 
+#define BBTK_BUSY_CURSOR bbtk::Wx::BusyCursor __bbtk_dummy_busy_cursor;
+
   struct BBTK_EXPORT Wx
   {	
   public:
@@ -63,60 +120,44 @@ 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:
       BusyCursor();
       ~BusyCursor();
+      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){