X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWx.cxx;h=f361a14af1b60d930958ce8078384e1b16ff071d;hb=6ac9074f717f22c4ffdc6a70d0704c1b1f8fe842;hp=346d0fbfe94263dfe720a2a634ce61041691943c;hpb=2b8d8f686974ab38c9ffcf0f88dd533b01b68e84;p=bbtk.git

diff --git a/kernel/src/bbtkWx.cxx b/kernel/src/bbtkWx.cxx
index 346d0fb..f361a14 100644
--- a/kernel/src/bbtkWx.cxx
+++ b/kernel/src/bbtkWx.cxx
@@ -1,125 +1,247 @@
-#ifdef _USE_WXWIDGETS_
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbtkWx.cxx,v $
+  Language:  C++
+  Date:      $Date: 2010/01/14 13:17:27 $
+  Version:   $Revision: 1.16 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
 
 #include "bbtkWx.h"
 #include "bbtkMessageManager.h"
 
+#ifdef _USE_WXWIDGETS_
+
 namespace bbtk
 {
+  //=========================================================================
+  class WxApp;
+  //=========================================================================
 
-//EED
+  //=========================================================================
+  static WxApp* mgWxApp = 0;
   static wxWindow* mgTopWindow = 0;
   static int mgNbWindowsAlive  = 0;
-  static int mgNbWindowsShown  = 0;
+  //=========================================================================
+  
+  //=========================================================================
+  // BBTKWXSIG
+  static Wx::Signal_type mgWxSignal;
+  // \BBTKWXSIG
+  //=========================================================================
 
-  void Wx::CreateInvisibleTopWindow(wxWindow* parent)
+ 
+  //=========================================================================
+  // The wxApp class which is used when no user wxApp was created
+  class WxApp : public wxApp
   {
-    wxWindow* top = new wxFrame(parent,
-				-1,_T("TOP (YOU SHOULD NOT SEE ME !!)"));
-    top->Hide();
-    Wx::SetTopWindow(top);
+  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::ResetCursor() 
+  //=========================================================================
+
+  //=========================================================================
+  void Wx::CreateWxAppIfNeeded()
   {
-    if (!GetTopWindow()) return;
-    bbtkDebugMessage("wx",9,"wx::ResetCursor()"<<std::endl);
-    while (wxIsBusy()) ::wxEndBusyCursor();
+    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();
+      } 
   }
-  void Wx::BeginBusyCursor() 
+  //=========================================================================
+
+  //=========================================================================
+  void Wx::DestroyWxAppIfNeeded()
   {
-    if (!GetTopWindow()) return;
-    bbtkDebugMessage("wx",9,"wx::BeginBusyCursor()"<<std::endl);
-    ::wxBeginBusyCursor();
+    if (mgWxApp!= 0) 
+      {
+	//	bbtkDebugMessage("wx",1,"  --> Destructing bbtk WxApp"<<std::endl);
+	//delete mgWxApp;
+	//	mgWxApp = 0;
+	// Uninit wx
+	//	wxUninitialize();
+      }
+  }
+  //=========================================================================
+
+
+  //=========================================================================
+  void Wx::ProcessPendingEvents()
+  {
+    /*
+    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;
+    */
   }
-  void Wx::EndBusyCursor()
+
+
+  //=========================================================================
+  wxWindow* Wx::GetTopWindow() 
+  { 
+    return mgTopWindow; 
+  }
+  //=========================================================================
+  
+
+  // BBTKWXSIG
+  //=========================================================================
+  void Wx::AddSignalObserver(Slot_function_type f)
   {
-    if (!GetTopWindow()) return;
-    bbtkDebugMessage("wx",9,"wx::EndBusyCursor()"<<std::endl);
-    ::wxEndBusyCursor();
+    mgWxSignal.connect(f);
   }
+  //=========================================================================
+  // \BBTKWXSIG
+
   
   //=========================================================================
   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;
+  }
+  //=========================================================================
+
+
+  //=========================================================================
+  void Wx::IncNbWindowsAlive() 
+  { 
+    mgNbWindowsAlive++; 
+    bbtkDebugMessage("wx",2,"* Number of windows alive = "<<mgNbWindowsAlive
+		     <<std::endl);
+    // BBTKWXSIG
+    mgWxSignal();
+    // \BBTKWXSIG
   }
   //=========================================================================
+
   //=========================================================================
   void Wx::DecNbWindowsAlive()
   { 
     mgNbWindowsAlive--; 
-    /*
-    if ( (bbmgNbWindowsAlive==0) && 
-	 bbmgTopWindow && (!bbmgTopWindow->IsShown()))
-      {
-	bbmgTopWindow->Close();
-      }
-    */
+    bbtkDebugMessage("wx",2,"* Number of windows alive = "<<mgNbWindowsAlive
+		     <<std::endl);
+
+    // BBTKWXSIG
+    mgWxSignal();
+    // \BBTKWXSIG
   }
   //=========================================================================
 
   //=========================================================================
-  void Wx::DecNbWindowsShown()
+  int  Wx::GetNbWindowsAlive() 
   { 
-    mgNbWindowsShown--; 
-    if ( (mgNbWindowsShown==0) && 
-	 mgTopWindow && (!mgTopWindow->IsShown()))
-      {
-	mgTopWindow->Close();
-      }
+    return mgNbWindowsAlive; 
   }
   //=========================================================================
-
+  
   //=========================================================================
-/*EED
-  // Static members 
-  wxWindow* Wx::mgTopWindow = 0;
-  int Wx::mgNbWindowsAlive  = 0;
-  int Wx::mgNbWindowsShown  = 0;
-*/
+  bool Wx::IsSomeWindowAlive() 
+  { 
+    return (mgNbWindowsAlive!=0);
+  }
   //=========================================================================
+  
 
+  //=========================================================================
+  Wx::BusyCursor::BusyCursor()
+  {
+    mCursor = 0;
+    if (wxApp::GetInstance()!=0) 
+      { 	
+	bbtkDebugMessage("wx",2,
+			 "Wx::BusyCursor::BusyCursor() : creating new cursor"
+			 <<std::endl);
+	//mCursor = new wxBusyCursor; 
+    }
+  }
+  //=========================================================================
+  //=========================================================================
+  Wx::BusyCursor::~BusyCursor()
+  {
+    if (mCursor)
+      { 
+	//delete mCursor;
+	bbtkDebugMessage("wx",2,
+			 "Wx::BusyCursor::~BusyCursor() : deleting cursor"<<std::endl);
+      }
+  }
+  //=========================================================================
 
-//EED
-    wxWindow* Wx::GetTopWindow() 
-	{ 
-		return mgTopWindow; 
-	}
-
-    void Wx::IncNbWindowsAlive() 
-	{ 
-		mgNbWindowsAlive++; 
-	}
-
-    int  Wx::GetNbWindowsAlive() 
-	{ 
-		return mgNbWindowsAlive; 
-	}
-
-    bool Wx::IsSomeWindowAlive() 
-	{ 
-		return (mgNbWindowsAlive>0);
-	}
-
-    void Wx::IncNbWindowsShown() 
-	{ 
-		mgNbWindowsShown++; 
-	}
 
-    int  Wx::GetNbWindowsShown() 
-	{ 
-		return mgNbWindowsShown; 
-	}
 
-    bool Wx::IsSomeWindowShown() 
-	{ 
-		return (mgNbWindowsShown>0);
-	}
+} // namespace bbtk
 
-}
+#else
+//=======================================================================
+// WITHOUT WX
+//=========================================================================
+namespace bbtk
+{
+   //=========================================================================
+  Wx::BusyCursor::BusyCursor()
+  {
+  }
+  Wx::BusyCursor::~BusyCursor()
+  {
+  }
+  //=========================================================================
 
+} // namespace bbtk
 #endif
+