X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWx.cxx;h=69cfc4db3e24dbb42ec2a50c40046a7869d573b7;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=aa05db7b0633e969f12352490573b3335a180011;hpb=174ea6d71477e40679f4fd71952e3f2a03416098;p=bbtk.git

diff --git a/kernel/src/bbtkWx.cxx b/kernel/src/bbtkWx.cxx
index aa05db7..69cfc4d 100644
--- a/kernel/src/bbtkWx.cxx
+++ b/kernel/src/bbtkWx.cxx
@@ -1,50 +1,147 @@
-#ifdef _USE_WXWIDGETS_
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.cxx,v $
+  Language:  C++
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.17 $
+=========================================================================*/
+
+
 
 #include "bbtkWx.h"
 #include "bbtkMessageManager.h"
-#include <boost/signal.hpp>
-//#include <boost/bind.hpp>
+
+#ifdef _USE_WXWIDGETS_
 
 namespace bbtk
 {
+  //=========================================================================
+  class WxApp;
+  //=========================================================================
 
+  //=========================================================================
+  static WxApp* mgWxApp = 0;
   static wxWindow* mgTopWindow = 0;
   static int mgNbWindowsAlive  = 0;
-  static int mgNbWindowsShown  = 0;
-  static bool mgAutoDestroyTopWindow = true;
-
+  //=========================================================================
+  
+  //=========================================================================
   // BBTKWXSIG
   static Wx::Signal_type mgWxSignal;
   // \BBTKWXSIG
+  //=========================================================================
 
+ 
+  //=========================================================================
+  // The wxApp class which is used when no user wxApp was created
+  class WxApp : public wxApp
+  {
+  public:
+    bool OnInit( );
+    int  OnExit() { return true; }
+  };
+  //=========================================================================
+  IMPLEMENT_APP_NO_MAIN(WxApp);
+  //=========================================================================
+  bool WxApp::OnInit( )
+  {	 
+    wxApp::OnInit();
+#ifdef __WXGTK__
+    //See http://www.wxwindows.org/faqgtk.htm#locale
+    setlocale(LC_NUMERIC, "C");
+#endif
+    return true;
+  }
+  //=========================================================================
 
   //=========================================================================
-  void Wx::CreateTopWindow(wxWindow* parent, bool autodestroy)
+  void Wx::CreateWxAppIfNeeded()
   {
-    wxWindow* top = 
-      new wxFrame(parent,
-		  -1,
-		  _T("TOP BBTK FRAME (YOU SHOULD NOT SEE ME !!)"));
-    top->Hide();
-    Wx::SetTopWindow(top);
-    mgAutoDestroyTopWindow = autodestroy;
+    if (wxApp::GetInstance()==0)
+      {
+	if (mgWxApp != 0) 
+	  {
+	    bbtkGlobalError("Wx::CreateWxAppIfNeeded() : INTERNAL ERROR ! (wxApp::GetInstance()==0) && (mgWxApp != 0)");
+	  }
+	bbtkDebugMessage("wx",1,"  --> Creating bbtk wxApp"<<std::endl);
+	mgWxApp = new WxApp;
+	wxApp::SetInstance(mgWxApp);
+	wxInitialize();
+      } 
   }
   //=========================================================================
-  
+
   //=========================================================================
-  wxWindow* Wx::GetTopWindow() 
-  { 
-    if (mgTopWindow==0) Wx::CreateTopWindow(0);
-    return mgTopWindow; 
+  void Wx::DestroyWxAppIfNeeded()
+  {
+    if (mgWxApp!= 0) 
+      {
+	//	bbtkDebugMessage("wx",1,"  --> Destructing bbtk WxApp"<<std::endl);
+	//delete mgWxApp;
+	//	mgWxApp = 0;
+	// Uninit wx
+	//	wxUninitialize();
+      }
   }
   //=========================================================================
-  
+
+
   //=========================================================================
-  bool Wx::TopWindowExists()
+  void Wx::ProcessPendingEvents()
   {
-    return (mgTopWindow!=0);
+    /*
+    if (Wx::GetTopWindow() != 0)
+      {
+	Wx::GetTopWindow()->DestroyChildren();
+      }
+    */
+
+    /*
+    wxApp* a = (wxApp*)wxApp::GetInstance();
+    if (a==0) return;
+    
+    std::cout << "$$$$$$$$$$$$$$ PROCESS PENDING "<<std::endl;
+    while (a->Pending())
+      a->Dispatch();
+    std::cout << "$$$$$$$$$$$$$$ PROCESS PENDING DONE"<<std::endl;
+    */
+  }
+
+
+  //=========================================================================
+  wxWindow* Wx::GetTopWindow() 
+  { 
+    return mgTopWindow; 
   }
   //=========================================================================
+  
 
   // BBTKWXSIG
   //=========================================================================
@@ -55,21 +152,15 @@ namespace bbtk
   //=========================================================================
   // \BBTKWXSIG
 
-  //=========================================================================
-  void Wx::AutoDestroyTopWindow(bool b)
-  {
-    mgAutoDestroyTopWindow = b;
-  }
-  //=========================================================================
   
   //=========================================================================
   void Wx::SetTopWindow(wxWindow* w) 
   {
     if ( mgTopWindow ) 
       {
-	bbtkGlobalError("wx::SetTopWindow : top window already set !");
+	bbtkGlobalError("Wx::SetTopWindow : top window already set !");
       } 
-    mgTopWindow = w;
+    //mgTopWindow = w;
   }
   //=========================================================================
 
@@ -92,51 +183,13 @@ namespace bbtk
     mgNbWindowsAlive--; 
     bbtkDebugMessage("wx",2,"* Number of windows alive = "<<mgNbWindowsAlive
 		     <<std::endl);
-    if ( (mgNbWindowsAlive==0) && 
-	 (mgAutoDestroyTopWindow) )
-      {
-    bbtkDebugMessage("wx",2,"  --> Destructing top window"<<std::endl);
- 	mgTopWindow->Close();
-	mgTopWindow = 0;
-      }
-    // BBTKWXSIG
-    mgWxSignal();
-    // \BBTKWXSIG
-  }
-  //=========================================================================
-  
-  //=========================================================================
-  void Wx::IncNbWindowsShown() 
-  { 
-    mgNbWindowsShown++; 
-    bbtkDebugMessage("wx",2,"* Number of windows shown = "<<mgNbWindowsShown
-		     <<std::endl);
-    // BBTKWXSIG
-    mgWxSignal();
-    // \BBTKWXSIG
-  }
-  //=========================================================================
 
-  //=========================================================================
-  void Wx::DecNbWindowsShown()
-  { 
-    mgNbWindowsShown--; 
-    bbtkDebugMessage("wx",2,"* Number of windows shown = "<<mgNbWindowsShown
-		     <<std::endl);
-    if ( (mgNbWindowsAlive==0) && 
-	 (mgAutoDestroyTopWindow) )
-      {
-	bbtkDebugMessage("wx",2,"  --> Destructing top window"<<std::endl);
- 	mgTopWindow->Close();
-	mgTopWindow = 0;
-      }
     // BBTKWXSIG
     mgWxSignal();
     // \BBTKWXSIG
   }
   //=========================================================================
 
-
   //=========================================================================
   int  Wx::GetNbWindowsAlive() 
   { 
@@ -147,51 +200,55 @@ namespace bbtk
   //=========================================================================
   bool Wx::IsSomeWindowAlive() 
   { 
-    return (mgNbWindowsAlive>0);
-  }
-  //=========================================================================
-  
-  
-  //=========================================================================
-  int  Wx::GetNbWindowsShown() 
-  { 
-    return mgNbWindowsShown; 
+    return (mgNbWindowsAlive!=0);
   }
   //=========================================================================
   
+
   //=========================================================================
-  bool Wx::IsSomeWindowShown() 
-  { 
-    return (mgNbWindowsShown>0);
+  Wx::BusyCursor::BusyCursor()
+  {
+    mCursor = 0;
+    if (wxApp::GetInstance()!=0) 
+      { 	
+	bbtkDebugMessage("wx",2,
+			 "Wx::BusyCursor::BusyCursor() : creating new cursor"
+			 <<std::endl);
+	//mCursor = new wxBusyCursor; 
+    }
   }
   //=========================================================================
-  
   //=========================================================================
-  void Wx::ResetCursor() 
+  Wx::BusyCursor::~BusyCursor()
   {
-    if (!TopWindowExists()) return;
-    bbtkDebugMessage("wx",9,"Wx::ResetCursor()"<<std::endl);
-    while (wxIsBusy()) ::wxEndBusyCursor();
+    if (mCursor)
+      { 
+	//delete mCursor;
+	bbtkDebugMessage("wx",2,
+			 "Wx::BusyCursor::~BusyCursor() : deleting cursor"<<std::endl);
+      }
   }
   //=========================================================================
-  //=========================================================================
-  void Wx::BeginBusyCursor() 
+
+
+
+} // namespace bbtk
+
+#else
+//=======================================================================
+// WITHOUT WX
+//=========================================================================
+namespace bbtk
+{
+   //=========================================================================
+  Wx::BusyCursor::BusyCursor()
   {
-    if (!TopWindowExists()) return;
-    bbtkDebugMessage("wx",9,"Wx::BeginBusyCursor()"<<std::endl);
-    ::wxBeginBusyCursor();
   }
-  //=========================================================================
-  //=========================================================================
-  void Wx::EndBusyCursor()
+  Wx::BusyCursor::~BusyCursor()
   {
-    if (!TopWindowExists()) return;
-    bbtkDebugMessage("wx",9,"Wx::EndBusyCursor()"<<std::endl);
-    ::wxEndBusyCursor();
   }
   //=========================================================================
 
-
-}
-
+} // namespace bbtk
 #endif
+