From 28479cf7460f053625842de2e8df98b2e3363ede Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Tue, 19 May 2009 10:19:23 +0000
Subject: [PATCH] *** empty log message ***

---
 kernel/src/bbtkMessageManager.cxx       | 14 +++++++--
 kernel/src/bbtkPackage.h                | 14 +++++++--
 kernel/src/bbtkQtBlackBoxDialog.cxx     |  8 +++--
 kernel/src/bbtkQtBlackBoxDialog.h       |  2 +-
 kernel/src/bbtkWidgetBlackBox.txx       | 20 +++++++-----
 kernel/src/bbtkWidgetBlackBoxWindow.h   |  6 ++--
 kernel/src/bbtkWidgetBlackBoxWindow.txx | 16 ++++++----
 kernel/src/bbtkWx.cxx                   | 16 +++++-----
 kernel/src/bbtkWxBlackBox.cxx           | 42 ++++++++++++++++++-------
 kernel/src/bbtkWxBlackBox.h             |  8 ++---
 10 files changed, 97 insertions(+), 49 deletions(-)

diff --git a/kernel/src/bbtkMessageManager.cxx b/kernel/src/bbtkMessageManager.cxx
index eae9e3b..4d673d4 100644
--- a/kernel/src/bbtkMessageManager.cxx
+++ b/kernel/src/bbtkMessageManager.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkMessageManager.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/08 12:54:27 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2009/05/19 10:19:23 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -86,10 +86,18 @@ namespace bbtk
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Data related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "wx";
+    key = "widget";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Widgets related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key = "wx";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "wxWidgets related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key = "qt";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "Qt related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
     key = "gui";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Graphical user interface related messages";
diff --git a/kernel/src/bbtkPackage.h b/kernel/src/bbtkPackage.h
index 9a1c46a..f287675 100644
--- a/kernel/src/bbtkPackage.h
+++ b/kernel/src/bbtkPackage.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.h,v $
   Language:  C++
-  Date:      $Date: 2009/01/13 08:45:27 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/05/19 10:19:23 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -64,6 +64,13 @@ namespace bbtk
 					    const std::string& pkgname,
 					    const std::string& path);
 
+    /// NOTE : All the static methods below for package destruction
+    /// are not member because they can cause the package death 
+    /// and thus close the dynamic library from which it has been loaded.
+    /// If the dynamic lib which provides a function is closed while 
+    /// in the function: imagine the crash !
+    /// The principal method is Release
+
     /// UnLoads the package dynamic library 
     /// (if any and if the package is released)
     /// If doit == false then does not do it but just 
@@ -80,7 +87,8 @@ namespace bbtk
 
     /// "Releases" the package
     /// Signals the package that it can free its descriptors 
-    /// if they are no more used and frees and unloads the package 
+    /// if they are no more used 
+    /// then frees and unloads the package 
     /// if it is no more used (released)
     /// Note : Any non-weak pointer on the package must have been freed
     static void Release(Package::WeakPointer p);
diff --git a/kernel/src/bbtkQtBlackBoxDialog.cxx b/kernel/src/bbtkQtBlackBoxDialog.cxx
index 06189d5..36b7834 100644
--- a/kernel/src/bbtkQtBlackBoxDialog.cxx
+++ b/kernel/src/bbtkQtBlackBoxDialog.cxx
@@ -49,7 +49,7 @@ namespace bbtk
     exec();
     //    Show(false);
     //SetReturnCode( wxDialog::ShowModal() ); 
-    bbClose();
+    bbDestroy();
   }
   //=========================================================================
 
@@ -64,10 +64,12 @@ namespace bbtk
   //=========================================================================
 
   //=========================================================================
-  void QtBlackBoxDialog::bbClose()
+  void QtBlackBoxDialog::bbDestroy()
   {
-    bbtkDebugMessage("qt",9,"QtBlackBoxDialog::bbClose()"<<std::endl);
+    bbtkDebugMessage("qt",9,"QtBlackBoxDialog::bbDestroy()"<<std::endl);
+    Parent::bbDestroy();
     //wxDialog::Destroy();
+    
   }
   //=========================================================================
 
diff --git a/kernel/src/bbtkQtBlackBoxDialog.h b/kernel/src/bbtkQtBlackBoxDialog.h
index 34df264..a9d6202 100644
--- a/kernel/src/bbtkQtBlackBoxDialog.h
+++ b/kernel/src/bbtkQtBlackBoxDialog.h
@@ -32,7 +32,7 @@ namespace bbtk
     ~QtBlackBoxDialog();
     void bbShow();
     void bbHide();
-    void bbClose();
+    void bbDestroy();
     bool bbIsDialog() { return true; }
   };
   //=========================================================================
diff --git a/kernel/src/bbtkWidgetBlackBox.txx b/kernel/src/bbtkWidgetBlackBox.txx
index 1abdaad..2aeb178 100644
--- a/kernel/src/bbtkWidgetBlackBox.txx
+++ b/kernel/src/bbtkWidgetBlackBox.txx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWidgetBlackBox.txx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 14:43:34 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/05/19 10:19:23 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -79,10 +79,16 @@ namespace bbtk
   void WidgetBlackBox<T>::bbUserFinalizeProcessing()
   {
     bbtkDebugMessage("widget",9,"==> WidgetBlackBox::bbUserFinalizeProcessing() ["<<bbGetFullName()<<"]"<<std::endl);
-    if (bbGetWindow()) {
-      bbGetWindow()->bbClose();
-      bbSetWindow(0);
-    }
+    if (bbGetWindow()) 
+      {
+	if (GetUseCount()==0)
+	  {
+	    if (bbGetWindow()->bbIsShown()) DecNbWindowsShown();
+	    DecNbWindowsAlive();
+	  }
+	bbGetWindow()->bbDestroy();
+	bbSetWindow(0);
+      }
     bbtkDebugMessage("widget",9,"<== WidgetBlackBox::bbUserFinalizeProcessing() ["<<bbGetFullName()<<"]"<<std::endl);
   }
   //=========================================================================
@@ -223,7 +229,7 @@ namespace bbtk
     bbtkDebugMessageInc("widget",1,"=> WidgetBlackBox::bbCloseWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
-    if (bbGetWindow()!=0) bbGetWindow()->bbClose();
+    if (bbGetWindow()!=0) bbGetWindow()->bbDestroy();
 
     bbtkDebugMessageDec("widget",2,"<= WidgetBlackBox::bbCloseWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
diff --git a/kernel/src/bbtkWidgetBlackBoxWindow.h b/kernel/src/bbtkWidgetBlackBoxWindow.h
index 5fea07c..04344ad 100644
--- a/kernel/src/bbtkWidgetBlackBoxWindow.h
+++ b/kernel/src/bbtkWidgetBlackBoxWindow.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWidgetBlackBoxWindow.h,v $
   Language:  C++
-  Date:      $Date: 2009/04/08 07:56:11 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/05/19 10:19:23 $
+  Version:   $Revision: 1.2 $
 ========================================================================*/
 
 
@@ -68,7 +68,7 @@ namespace bbtk
     virtual ~WidgetBlackBoxWindow();
     virtual void bbShow();
     virtual void bbHide();
-    virtual void bbClose();
+    virtual void bbDestroy();
     bool bbIsShown() { return mShown; }
     virtual WidgetBlackBoxPointer bbGetBlackBox() { return mBox.lock(); }
     //virtual wxDialog* bbGetDialog() { return 0; } 
diff --git a/kernel/src/bbtkWidgetBlackBoxWindow.txx b/kernel/src/bbtkWidgetBlackBoxWindow.txx
index 2c7c266..aee8785 100644
--- a/kernel/src/bbtkWidgetBlackBoxWindow.txx
+++ b/kernel/src/bbtkWidgetBlackBoxWindow.txx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWidgetBlackBoxWindow.txx,v $
   Language:  C++
-  Date:      $Date: 2009/04/08 07:56:11 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/05/19 10:19:23 $
+  Version:   $Revision: 1.2 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -67,9 +67,9 @@ namespace bbtk
 		     "WidgetBlackBoxWindow::~WidgetBlackBoxWindow() "
 		     <<this<<std::endl);
     bbHide();
-    mBox.lock()->DecNbWindowsAlive();
     if (!mBox.expired())
       {
+	mBox.lock()->DecNbWindowsAlive();
 	mBox.lock()->bbSetWindow(0);
       }
   }
@@ -93,7 +93,7 @@ namespace bbtk
   template <class W>
   void WidgetBlackBoxWindow<W>::bbHide()
   {
-    if (!bbIsShown()) return;
+    if ((!bbIsShown())||(mBox.expired())) return;
     bbtkDebugMessage("widget",9,"WidgetBlackBoxWindow::bbHide() ["
 		     <<mBox.lock()->bbGetName()<<"]"<<std::endl);
     mBox.lock()->DecNbWindowsShown();
@@ -103,10 +103,14 @@ namespace bbtk
 
   //=========================================================================
   template <class W>
-  void WidgetBlackBoxWindow<W>::bbClose()
+  void WidgetBlackBoxWindow<W>::bbDestroy()
   {
-    bbtkDebugMessage("widget",9,"WidgetBlackBoxWindow::bbClose() [" 
+    if (mBox.expired()) return;
+    bbtkDebugMessage("widget",9,"WidgetBlackBoxWindow::bbDestroy() [" 
 		     <<mBox.lock()->bbGetName()<<"]"<<std::endl);
+    bbHide();
+    mBox.lock()->DecNbWindowsAlive();
+    mBox.lock()->bbSetWindow(0);
   }
   //=========================================================================
 
diff --git a/kernel/src/bbtkWx.cxx b/kernel/src/bbtkWx.cxx
index a15bb86..820a60f 100644
--- a/kernel/src/bbtkWx.cxx
+++ b/kernel/src/bbtkWx.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWx.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/08 07:56:11 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2009/05/19 10:19:23 $
+  Version:   $Revision: 1.14 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -134,7 +134,8 @@ namespace bbtk
 		  _T("TOP BBTK FRAME (YOU SHOULD NOT SEE ME !!)"));
     top->Hide();
 
-    Wx::SetTopWindow(top);
+    //if (mgTopWindowParent==0) 
+      Wx::SetTopWindow(top);
   }
   //=========================================================================
 
@@ -142,7 +143,8 @@ namespace bbtk
   void Wx::DestroyTopWindowIfNeeded()
   {
     if ( (mgNbWindowsAlive==0) && 
-	 (mgAutoDestroyTopWindow) )
+	 (mgAutoDestroyTopWindow) &&
+	 (mgTopWindow != 0))
       {
 	bbtkDebugMessage("wx",1,"  --> Destructing bbtk top window"<<std::endl);
  	mgTopWindow->Close();
@@ -258,7 +260,7 @@ namespace bbtk
     bbtkDebugMessage("wx",2,"* Number of windows shown = "<<mgNbWindowsShown
 		     <<std::endl);
 
-    DestroyTopWindowIfNeeded();
+    //   DestroyTopWindowIfNeeded();
 
     // BBTKWXSIG
     mgWxSignal();
@@ -306,14 +308,14 @@ namespace bbtk
 	bbtkDebugMessage("wx",2,
 			 "Wx::BusyCursor::BusyCursor() : creating new cursor"
 			 <<std::endl);
-	mCursor = new wxBusyCursor; 
+	//mCursor = new wxBusyCursor; 
     }
   }
   Wx::BusyCursor::~BusyCursor()
   {
     if (mCursor)
       { 
-	delete mCursor;
+	//delete mCursor;
 	bbtkDebugMessage("wx",2,
 			 "Wx::BusyCursor::~BusyCursor() : deleting cursor"<<std::endl);
       }
diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 245a074..d543faa 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 14:43:34 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2009/05/19 10:19:23 $
+  Version:   $Revision: 1.40 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -105,7 +105,7 @@ namespace bbtk
     Parent::bbShow();
     Show(false);
     SetReturnCode( wxDialog::ShowModal() ); 
-    bbClose();
+    bbDestroy();
   }
   //=========================================================================
 
@@ -119,9 +119,9 @@ namespace bbtk
   //=========================================================================
 
   //=========================================================================
-  void WxBlackBoxDialog::bbClose()
+  void WxBlackBoxDialog::bbDestroy()
   {
-    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::bbClose()"<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::bbDestroy()"<<std::endl);
     wxDialog::Destroy();
   }
   //=========================================================================
@@ -129,6 +129,8 @@ namespace bbtk
   //=========================================================================
   WxBlackBoxDialog::~WxBlackBoxDialog()
   {
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::~WxBlackBoxDialog()"
+		     <<std::endl);
   }
   //=========================================================================
 
@@ -178,6 +180,8 @@ namespace bbtk
   //=========================================================================
   WxBlackBoxFrame::~WxBlackBoxFrame()
   {
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::~WxBlackBoxFrame()"
+		     <<std::endl);
   }
   //=========================================================================
 
@@ -215,10 +219,10 @@ namespace bbtk
   //=========================================================================
 
   //=========================================================================
-  void WxBlackBoxFrame::bbClose()
+  void WxBlackBoxFrame::bbDestroy()
   {
-    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::bbClose()"<<std::endl);
-    wxFrame::Close();
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::bbDestroy()"<<std::endl);
+    wxFrame::Destroy();
   }
   //=========================================================================
 
@@ -254,23 +258,30 @@ namespace bbtk
   //=========================================================================
   WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler()
   {
+  bbtkDebugMessage("wx",9,
+		     "WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler() ["
+		<<std::endl);
+
+
+    Disconnect (  mWindow->GetId() );
+
     if (mBox.expired()) return;
     bbtkDebugMessage("wx",9,
 		     "WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler() ["
 		     <<mBox.lock()->bbGetFullName()<<"]"<<std::endl);
-     mBox.lock()->bbSetWidgetEventHandler(0);   
+
+    mBox.lock()->bbSetWidgetEventHandler(0);   
   }
   //=========================================================================
 
   //=========================================================================
   void WxBlackBoxWidgetEventHandler::OnWindowDestroy(wxWindowDestroyEvent&)
   {
+   bbtkDebugMessage("wx",9,"WxBlackBoxWidgetEventHandler::OnWindowDestroy() []"<<std::endl);
     if (mBox.expired()) return;
-    bbtkDebugMessage("wx",9,"WxBlackBoxWidgetEventHandler::OnWindowDestroy() ["
+    bbtkDebugMessage("wx",9,"WxBlackBoxWidgetEventHandler::OnWindowDestroy() alive ["
 		     <<mBox.lock()->bbGetFullName()<<"]"<<std::endl);
     mBox.lock()->bbSetOutputWidget(0);
-    // LGSIGNAL
-    //    mBox.lock()->bbSetModifiedStatus();
   }
   //=========================================================================
 
@@ -308,6 +319,13 @@ namespace bbtk
   //=========================================================================
   void WxBlackBox::bbUserFinalizeProcessing()
   {
+    bbtkDebugMessage("wx",9,"WxBlackBox::bbUserFinalizeProcessing()"<<std::endl);
+    if (bbGetWidgetEventHandler()!=0)
+      {
+	bbtkDebugMessage("wx",9,"Deleting Widget Event Handler"<<std::endl);
+	delete bbGetWidgetEventHandler();
+      }
+    
   }
   //==================================================================    
 
diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index 7c9db44..b93adeb 100644
--- a/kernel/src/bbtkWxBlackBox.h
+++ b/kernel/src/bbtkWxBlackBox.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 14:43:34 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2009/05/19 10:19:23 $
+  Version:   $Revision: 1.28 $
 ========================================================================*/
 
 
@@ -160,7 +160,7 @@ namespace bbtk
     ~WxBlackBoxDialog();
     void bbShow();  
     void bbHide();
-    void bbClose();
+    void bbDestroy();
     bool IsDialog() { return true; }
     bool IsFrame() { return false; }
     wxDialog* bbGetDialog() { return this; } 
@@ -179,7 +179,7 @@ namespace bbtk
     ~WxBlackBoxFrame();
     void bbShow();
     void bbHide();
-    void bbClose();
+    void bbDestroy();
     bool IsDialog() { return false; }
     bool IsFrame() { return true; }
     wxFrame* bbGetFrame() { return this; } 
-- 
2.45.1