X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWidgetBlackBoxWindow.txx;h=bc77e9b989c4aee5e394e2bf88b33e1db3c0de70;hb=a280c10c9ba7730cd9105a91bf1a40e72503a6e3;hp=2c7c2668bd75e69c52fde73e9b0c4ccc0b0d8303;hpb=038dbbd7dd8b34107ec932a34170a4625368eb25;p=bbtk.git

diff --git a/kernel/src/bbtkWidgetBlackBoxWindow.txx b/kernel/src/bbtkWidgetBlackBoxWindow.txx
index 2c7c266..bc77e9b 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/06/10 11:36:52 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -66,10 +66,12 @@ namespace bbtk
     bbtkDebugMessage("widget",9,
 		     "WidgetBlackBoxWindow::~WidgetBlackBoxWindow() "
 		     <<this<<std::endl);
+    std::cout << "**** WidgetBlackBoxWindow::~WidgetBlackBoxWindow() "
+	      <<this<<std::endl;
     bbHide();
-    mBox.lock()->DecNbWindowsAlive();
     if (!mBox.expired())
       {
+	mBox.lock()->DecNbWindowsAlive();
 	mBox.lock()->bbSetWindow(0);
       }
   }
@@ -93,7 +95,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 +105,16 @@ 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);
+    
   }
   //=========================================================================