X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkWx.h;h=13bc15ad2ff32de2ff42b19d04557774959974bb;hb=6ad7245d4cf6a38427aceed7e5cd1a6664bceec1;hp=0a388e5afd4a0a16a02cb350d10f6455f592fb9a;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h
index 0a388e5..13bc15a 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/10/17 08:18:14 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2009/05/28 08:12:06 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -57,7 +57,7 @@
 
 //===========================================================================
 // 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>
@@ -76,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
 //===========================================================================
 
 //===========================================================================
@@ -119,14 +120,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,45 +128,36 @@ 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){