X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWx.h;h=d3f3318f86bd3a854ad93d266d743ebb3320e20a;hb=ef68c7c7d002e0fcaf3255868c54021b3cf077df;hp=7d64a023a94f22119dd08b7ad41ba1dac1bdeacf;hpb=6c8a2137ff5c30872ea69ba70284818d288892a7;p=bbtk.git

diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h
index 7d64a02..d3f3318 100644
--- a/kernel/src/bbtkWx.h
+++ b/kernel/src/bbtkWx.h
@@ -1,14 +1,7 @@
 #ifndef __bbtkWx_h_INCLUDED__
 #define __bbtkWx_h_INCLUDED__
 
-
-/*
-#ifdef wxUSE_STD_IOSTREAM
-#undef wxUSE_STD_IOSTREAM
-#endif
-#define wxUSE_STD_IOSTREAM 0
-*/
-
+//===========================================================================
 // Wx headers
 #ifdef _USE_WXWIDGETS_
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -29,25 +22,69 @@
 #endif //__WXGTK__
 // EO Wx headers
 
+#else //_USE_WXWIDGETS_
+
+// define wxWindow
+typedef void wxWindow;
+
+#endif // EO _USE_WXWIDGETS_
+//===========================================================================
+
+//===========================================================================
 #include "bbtkSystem.h"
+//===========================================================================
+
+//===========================================================================
+// SIGNAL/SLOT MECHANISM 
+// FOR bbtk WINDOWS CREATION/DESTRUCTION OBSERVATION 
+// BBTKWXSIG
+#include <boost/signal.hpp>
+#include <boost/bind.hpp>
+// \BBTKWXSIG
+//===========================================================================
 
 namespace bbtk
 {
+
   //==================================================================
   /// Global wx handlers (cursor...)
   
+// BBTKWXSIG
+#define bbtkAddWxSignalObserver(METHOD)		\
+  Wx::AddSignalObserver(boost::bind(&METHOD, this))
+// \BBTKWXSIG
+
   struct BBTK_EXPORT Wx
   {	
   public:
+    // BBTKWXSIG
+    typedef boost::signals::trackable SignalObserver;
+    typedef boost::signal<void ()>  Signal_type;
+    typedef Signal_type::slot_function_type Slot_function_type;
+    // \BBTKWXSIG
+
+    /*
     static void ResetCursor();
     static void BeginBusyCursor(); 
     static void EndBusyCursor();
-    static int mBeginBusyCallsCount;
+    */
 
-    /// Returns the global parent of all bbtk windows
+    static void LoopUntilAllWindowsClose();
+
+    class BusyCursor
+    {
+    public:
+      BusyCursor();
+      ~BusyCursor();
+    };
+
+    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();
-    /// Sets the global parent of all bbtk windows
-    static void SetTopWindow(wxWindow*);
+    static bool TopWindowExists();
     
     static void IncNbWindowsAlive();
     static void DecNbWindowsAlive();
@@ -58,18 +95,28 @@ namespace bbtk
     static void DecNbWindowsShown();
     static int  GetNbWindowsShown();
     static bool IsSomeWindowShown();
-    
-/*EED
+
+    // BBTKWXSIG
+    static void AddSignalObserver(Slot_function_type);
+    // \BBTKWXSIG
+
   private:
-    static wxWindow* mgTopWindow;
-    static int mgNbWindowsAlive;
-    static int mgNbWindowsShown;
-*/
+
+    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_
   //==================================================================
   /// Conversion std::string to wxString 
   inline wxString std2wx(const std::string& s){
@@ -99,40 +146,10 @@ namespace bbtk
     return s2;
   }
   //==================================================================
-
+#endif // EO _USE_WXWIDGETS
 
   
 } // namespace bbtk
   
 
-
-#else // _USE_WXWIDGETS
-
-
-namespace bbtk
-{
-
-  struct BBTK_EXPORT Wx
-  {
-    static void ResetCursor() {}
-    static void BeginBusyCursor() {}
-    static void EndBusyCursor() {}
-    static wxWindow* GetTopWindow() { return 0; }
-    static void SetTopWindow(wxWindow*) {}
-    static void IncNbWindowsAlive() {}
-    static void DecNbWindowsAlive() {}
-    static int  GetNbWindowsAlive() { return 0; }
-    static bool IsSomeWindowAlive() { return false; }
-    
-    static void IncNbWindowsShown() {}
-    static void DecNbWindowsShown() {}
-    static int  GetNbWindowsShown() { return 0; }
-    static bool IsSomeWindowShown() { return false; }
-  }; // struct Wx
-
-} // namespace bbtk
-  
-
-
-#endif // EO _USE_WXWIDGETS
 #endif // EO __bbtkWx_h_INCLUDED__