X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWx.h;h=52eca34bd2365486c8308aeb7ecd4835cf86353b;hb=84454af9be8cecfbf41ca7c0198c65efe60f9b48;hp=a27aae1e88a87b5f3439313b68db913facb5d193;hpb=5ca30b861f60def2666a1c675e8b45df0a713f95;p=bbtk.git

diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h
index a27aae1..52eca34 100644
--- a/kernel/src/bbtkWx.h
+++ b/kernel/src/bbtkWx.h
@@ -1,16 +1,47 @@
-#ifndef __bbtkWx_h_INCLUDED__
-#define __bbtkWx_h_INCLUDED__
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.13 $
+=========================================================================*/
+
 
 
-/*
-#ifdef wxUSE_STD_IOSTREAM
-#undef wxUSE_STD_IOSTREAM
-#endif
-#define wxUSE_STD_IOSTREAM 0
-*/
 
+#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>
@@ -29,45 +60,86 @@
 #endif //__WXGTK__
 // EO Wx headers
 
+#else //USE_WXWIDGETS
+
+// define wxWindow
+typedef void wxWindow;
+typedef void wxBusyCursor;
+
+#endif // EO USE_WXWIDGETS
+//===========================================================================
+
+//===========================================================================
 #include "bbtkSystem.h"
+//===========================================================================
+
+//===========================================================================
+// SIGNAL/SLOT MECHANISM 
+// FOR bbtk WINDOWS CREATION/DESTRUCTION OBSERVATION 
+// BBTKWXSIG
+#include <boost/signals2/signal.hpp>
+#include <boost/bind.hpp>
+// \BBTKWXSIG
+//===========================================================================
 
 namespace bbtk
 {
+
   //==================================================================
   /// Global wx handlers (cursor...)
   
+// BBTKWXSIG
+#define bbtkAddWxSignalObserver(METHOD)		\
+  Wx::AddSignalObserver(boost::bind(&METHOD, this))
+// \BBTKWXSIG
+
+#define BBTK_BUSY_CURSOR bbtk::Wx::BusyCursor __bbtk_dummy_busy_cursor;
+
   struct BBTK_EXPORT Wx
   {	
   public:
-    static void ResetCursor();
-    static void BeginBusyCursor(); 
-    static void EndBusyCursor();
-    static int mBeginBusyCallsCount;
-
-    /// Returns the global parent of all bbtk windows
-    static wxWindow* GetTopWindow() { return mgTopWindow; }
-    /// Sets the global parent of all bbtk windows
-    static void SetTopWindow(wxWindow*);
+    // BBTKWXSIG
+    typedef boost::signals2::trackable SignalObserver;
+    typedef boost::signals2::signal<void ()>  Signal_type;
+    typedef Signal_type::slot_function_type Slot_function_type;
+    // \BBTKWXSIG
+
+    class BusyCursor
+    {
+    public:
+      BusyCursor();
+      ~BusyCursor();
+      wxBusyCursor* mCursor;
+    };
+
+    static void ProcessPendingEvents();
     
-    static void IncNbWindowsAlive() { mgNbWindowsAlive++; }
+    /// 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() { return mgNbWindowsAlive; }
-    static bool IsSomeWindowAlive() { return (mgNbWindowsAlive>0);}
-    
-    static void IncNbWindowsShown() { mgNbWindowsShown++; }
-    static void DecNbWindowsShown();
-    static int  GetNbWindowsShown() { return mgNbWindowsShown; }
-    static bool IsSomeWindowShown() { return (mgNbWindowsShown>0);}
+    static int  GetNbWindowsAlive();
+    static bool IsSomeWindowAlive();
     
+     // BBTKWXSIG
+    static void AddSignalObserver(Slot_function_type);
+    // \BBTKWXSIG
+
+  
   private:
-    static wxWindow* mgTopWindow;
-    static int mgNbWindowsAlive;
-    static int mgNbWindowsShown;
+
+    static void CreateWxAppIfNeeded();
+    static void DestroyWxAppIfNeeded();
 
   }; // struct Wx
   //==================================================================
-  
-  
+
+
+#ifdef USE_WXWIDGETS
   //==================================================================
   /// Conversion std::string to wxString 
   inline wxString std2wx(const std::string& s){
@@ -97,40 +169,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__