X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=401ac4130637bbde28941572f8f28ab7a03b47bc;hb=daa4b4dd18d9320341aed677d97e78f890fa88a3;hp=2413e4a55aba8e69c9e067adafb05c2db8b156db;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 2413e4a..401ac41 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:16 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2008/06/27 08:12:46 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -51,27 +51,24 @@ namespace bbtk
   WxBlackBoxWindow::WxBlackBoxWindow(WxBlackBox::Pointer box)
     : mBox(box), mShown(false)
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::WxBlackBoxWindow("<<
-		     mBox->bbGetFullName()<<")"<<std::endl);
-    mBox->bbSetWindow(this);
+    bbtkDebugMessage("wx",9,"WxBlackBoxWindow::WxBlackBoxWindow("<<
+		     mBox.lock()->bbGetFullName()<<")"<<std::endl);
+    mBox.lock()->bbSetWindow(this);
     Wx::IncNbWindowsAlive();
-    bbtkDebugMessage("Wx",5," -> Number of windows alive = "
-		     <<Wx::GetNbWindowsAlive()<<std::endl);
   }
   //=========================================================================
 
   //=========================================================================
   WxBlackBoxWindow::~WxBlackBoxWindow()
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::~WxBlackBoxWindow() ["<<
-		     mBox->bbGetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxWindow::~WxBlackBoxWindow() "
+		     <<this<<std::endl);
     bbHide();
-    mBox->bbSetWindow(0);
     Wx::DecNbWindowsAlive();
-    bbtkDebugMessage("Wx",5," -> Number of windows alive = "
-		     <<Wx::GetNbWindowsAlive()<<std::endl);
-     
-
+    if (!mBox.expired())
+      {
+	mBox.lock()->bbSetWindow(0);
+      }
   }
   //========================================================================= 
 
@@ -80,12 +77,9 @@ namespace bbtk
   void WxBlackBoxWindow::bbShow()
   {
     if (bbIsShown()) return;
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::bbShow() ["<<
-		     mBox->bbGetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbShow()"<<std::endl);
     Wx::IncNbWindowsShown();
     mShown = true;
-    bbtkDebugMessage("Wx",5," -> Number of windows shown = "
-		     <<Wx::GetNbWindowsShown()<<std::endl);
   }
   //=========================================================================
 
@@ -93,15 +87,17 @@ namespace bbtk
   void WxBlackBoxWindow::bbHide()
   {
     if (!bbIsShown()) return;
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::bbHide() ["<<
-		     mBox->bbGetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbHide()"<<std::endl);
     Wx::DecNbWindowsShown();
     mShown = false;
-    bbtkDebugMessage("Wx",5," -> Number of windows shown = "
-		     <<Wx::GetNbWindowsShown()<<std::endl);
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxWindow::bbClose()
+  {
+  }
+  //=========================================================================
 
 
   //=========================================================================
@@ -128,7 +124,7 @@ namespace bbtk
 		wxCAPTION  
 		)
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<<
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
 		     <<title<<",size)"<<std::endl);
     // Insert the widget into the window
@@ -145,23 +141,30 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxDialog::bbShow()
   { 
-    bbtkDebugMessage("Wx",5,"WxBlackBoxDialog::bbShow() ["
+    bbtkDebugMessage("wx",5,"WxBlackBoxDialog::bbShow() ["
 		     <<bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
     WxBlackBoxWindow::bbShow();
     SetReturnCode( wxDialog::ShowModal() ); 
+    bbHide();
   }
   //=========================================================================
 
   //=========================================================================
   void WxBlackBoxDialog::bbHide()
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxDialog::bbHide() ["<<
-		     bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::bbHide()"<<std::endl);
     WxBlackBoxWindow::bbHide();
     Hide();
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxDialog::bbClose()
+  {
+    wxDialog::Close();
+  }
+  //=========================================================================
+
   //=========================================================================
   WxBlackBoxDialog::~WxBlackBoxDialog()
   {
@@ -195,7 +198,7 @@ namespace bbtk
 	       wxCAPTION  
 	       )
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxFrame::WxBlackBoxFrame("<<
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::WxBlackBoxFrame("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
 		     <<title<<",size)"<<std::endl);
     // Insert the widget into the window
@@ -220,102 +223,41 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxFrame::bbShow() 
   { 
-    bbtkDebugMessage("Wx",5,"WxBlackBoxFrame::bbShow("
+    bbtkDebugMessage("wx",5,"WxBlackBoxFrame::bbShow("
 		     <<bbGetBlackBox()->bbGetFullName()<<")"<<std::endl);
     WxBlackBoxWindow::bbShow();
-    wxFrame::Show();
+  wxFrame::Show();
     // This Update is ** MANDATORY ** 
     // to synchronize wxvtkRenderWindowInteractor objects
     // (force wx objects creation **NOW**)
-    wxFrame::Update();
-    bbGetBlackBox()->bbUserOnShow();
-    //    wxFrame::SetFocus();
-  }
-  //=========================================================================
-
-  //=========================================================================
-  void WxBlackBoxFrame::bbHide()
-  {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxFrame::bbHide() ["<<
-		     bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
-    WxBlackBoxWindow::bbHide();
-    wxFrame::Hide();
-    bbGetBlackBox()->bbUserOnHide();
-  }
-  //=========================================================================
-
 
 
-  //=========================================================================
-  // WxBlackBoxDialogWrapper
-  //=========================================================================
-  /*
-  //=========================================================================
-  WxBlackBoxDialogWrapper::WxBlackBoxDialogWrapper(WxBlackBox* box,
-						   wxDialog *wrapped) 
-    : WxBlackBoxWindow(box),
-      mWrapped(wrapped) 
-  {
-    bbtkDebugMessage("Wx",9,
-		     "WxBlackBoxDialogWrapper::WxBlackBoxDialogWrapper("
-		     <<bbGetBlackBox()->bbGetFullName()<<","<<wrapped
-		     <<")"<<std::endl);
-  }
-  //=========================================================================
-
-  //=========================================================================
-  WxBlackBoxDialogWrapper::~WxBlackBoxDialogWrapper()
-  {
-  }
-  //=========================================================================
+#if defined(_WIN32)
+      wxFrame::Refresh();
+#endif
 
-  //=========================================================================
-  void WxBlackBoxDialogWrapper::bbShow() 
-  {  
-    bbtkDebugMessage("Wx",5,"WxBlackBoxDialogWrapper::bbShow("
-		     <<bbGetBlackBox()->bbGetFullName()<<")"<<std::endl);
-    WxBlackBoxWindow::bbShow();
-    int i = mWrapped->ShowModal();
-    // For Windows :
-    mWrapped->SetReturnCode( i ); 
+      wxFrame::Update();
+      wxFrame::SetFocus();
+    if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();
   }
   //=========================================================================
 
   //=========================================================================
-  void WxBlackBoxDialogWrapper::bbHide()
+  void WxBlackBoxFrame::bbHide()
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxDialogWrapper::bbHide() ["<<
-		     bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::bbHide()"<<std::endl);
     WxBlackBoxWindow::bbHide();
-    mWrapped->Hide();
-  }
-  //=========================================================================
-
-  */
-
-  /*	 
-  //=========================================================================
-  // WxBlackBoxWidget
-  //=========================================================================
-
-  //=========================================================================
-  WxBlackBoxWidget::WxBlackBoxWidget( WxBlackBox* box)
-  : mBox(box)
-  {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWidget::WxBlackBoxWidget("<<box->bbGetFullName()<<")"<<std::endl);
-    mBox->bbSetWidget(this);
+    wxFrame::Hide();
+    if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnHide();
   }
   //=========================================================================
 
   //=========================================================================
-  WxBlackBoxWidget::~WxBlackBoxWidget()
+  void WxBlackBoxFrame::bbClose()
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWidget::~WxBlackBoxWidget("<<mBox->bbGetFullName()<<")"<<std::endl);
-    mBox->bbSetWidget(0);
-    //bbtkDebugMessage("Wx",9,"EO WxBlackBoxWidget::~WxBlackBoxWidget("<<mBox->bbGetFullName()<<")"<<std::endl);
+    wxFrame::Close();
   }
   //=========================================================================
-  */
 
 
 
@@ -330,11 +272,10 @@ namespace bbtk
     :
     mBox(box),
     mWindow(widget)
-							    //    mDead(false)
   { 
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWidgetEventHandler::WxBlackBoxWidgetEventHandler("<<mBox->bbGetFullName()<<")"<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxWidgetEventHandler::WxBlackBoxWidgetEventHandler("<<mBox.lock()->bbGetFullName()<<")"<<std::endl);
 
-    mBox->bbSetWidgetEventHandler(this);
+    mBox.lock()->bbSetWidgetEventHandler(this);
 
     Connect (  mWindow->GetId(),
 	       wxEVT_DESTROY,
@@ -350,22 +291,22 @@ namespace bbtk
   //=========================================================================
   WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler()
   {
-    bbtkDebugMessage("Wx",9,
-		     "WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler("
-		     <<mBox->bbGetFullName()<<")"<<std::endl);
-     mBox->bbSetWidgetEventHandler(0);   
+    if (mBox.expired()) return;
+    bbtkDebugMessage("wx",9,
+		     "WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler() ["
+		     <<mBox.lock()->bbGetFullName()<<"]"<<std::endl);
+     mBox.lock()->bbSetWidgetEventHandler(0);   
   }
   //=========================================================================
 
   //=========================================================================
   void WxBlackBoxWidgetEventHandler::OnWindowDestroy(wxWindowDestroyEvent&)
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWidgetEventHandler::OnWindowDestroy() ["
-		     <<mBox->bbGetFullName()<<"]"<<std::endl);
-    mBox->bbSetOutputWidget(0);
-    mBox->bbSetModifiedStatus();
-    //mDead = true;
-    //delete this;
+    if (mBox.expired()) return;
+    bbtkDebugMessage("wx",9,"WxBlackBoxWidgetEventHandler::OnWindowDestroy() ["
+		     <<mBox.lock()->bbGetFullName()<<"]"<<std::endl);
+    mBox.lock()->bbSetOutputWidget(0);
+    mBox.lock()->bbSetModifiedStatus();
   }
   //=========================================================================
 
@@ -375,46 +316,6 @@ namespace bbtk
 
 
 
-  /*
-  //=========================================================================
-  wxWindow* WxParentToChildData::GetWindowInWhichToInsert( const BlackBox* b)
-    const
-  {
-    bbtkDebugMessageInc("Kernel",9,"WxParentToChildData::GetWindowInWhichToInsert("<<b->bbGetFullName()<<")"<<std::endl);
-    
-    BlackBox::InputConnectorMapType::const_iterator i = b->bbGetInputConnectorMap().find("WinParent");
-    if (i==b->bbGetInputConnectorMap().end())
-      {
-	bbtkError("WxParentToChildData::GetWindowInWhichToInsert : the box "
-		  <<b->bbGetFullName()
-		  <<" does not have any 'Parent' input ?!?");
-      }
-    Connection* c = i->second->GetConnection();
-    if (!c) 
-      {
-	bbtkDebugMessage("Kernel",9,
-			 "-> The input 'Parent' of the box "
-			 <<b->bbGetFullName()
-			 <<" is not connected."<<std::endl);
-	return 0;
-      }
-    
-    std::map< Connection*, wxWindow *>::const_iterator j 
-      = mConnectionToWindowMap.find(c);
-
-    if (j==mConnectionToWindowMap.end())
-      {
-	bbtkError("WxParentToChildData::GetWindowInWhichToInsert("
-		  <<b->bbGetFullName()
-		  <<") no window provided by parent ?!?");
-      }
-
-    bbtkDebugDecTab("Kernel",9);
-    return j->second;
-  }
-  //=========================================================================
-  */
-  
   //=========================================================================
   // WxBlackBox
   //=========================================================================
@@ -447,12 +348,12 @@ namespace bbtk
   //=========================================================================
   void WxBlackBox::bbUserDestructor()
   {
-    bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserDestructor()"<<std::endl);
+    bbtkDebugMessage("wx",9,"==> WxBlackBox::bbUserDestructor() ["<<bbGetFullName()<<"]"<<std::endl);
     if (bbGetWindow()) {
       delete bbGetWindow();
-      //      bbSetWindow(0);
+      bbSetWindow(0);
     }
-    bbtkDebugMessage("Kernel",9,"EO WxBlackBox::bbUserDestructor()"<<std::endl);
+    bbtkDebugMessage("wx",9,"<== WxBlackBox::bbUserDestructor() ["<<bbGetFullName()<<"]"<<std::endl);
   }
   //=========================================================================
   
@@ -463,7 +364,7 @@ namespace bbtk
   { 
     if (bbGetOutputWidget() && bbGetOutputWidget()->IsDead()) 
       {
-	bbtkDebugMessage("Wx",9,"WxBlackBox::bbGetWidget() ["<<
+	bbtkDebugMessage("wx",9,"WxBlackBox::bbGetWidget() ["<<
 			 bbGetFullName()<<"] : Widget is dead : deleting it"
 			 <<std::endl);
 	delete bbGetOutputWidget();
@@ -492,6 +393,7 @@ namespace bbtk
     bbSetOutputWidget(0);
 
     bbSetWidgetEventHandler(0);
+    bbSetUpdateTransferedToParent(false);
   }
   //=========================================================================
 
@@ -499,7 +401,7 @@ namespace bbtk
   /// Main processing method of the box.
   void WxBlackBox::bbExecute(bool force)
   {
-    bbtkDebugMessageInc("Process",1,
+    bbtkDebugMessageInc("process",2,
 			"=> WxBlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
@@ -510,11 +412,11 @@ namespace bbtk
 
     if ( i->second->GetConnectionVector().size() != 0 ) 
       {
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("process",3,
 			 "-> Output 'Widget' connected : transfering execution to parent"
 			 <<std::endl);
 	
-	i->second->GetConnectionVector().front().lock()
+	i->second->GetConnectionVector().front() //.lock()
 	  ->GetBlackBoxTo()->bbExecute(force);
 
       }
@@ -525,7 +427,7 @@ namespace bbtk
       }
     //
 
-    bbtkDebugMessageDec("Process",1,
+    bbtkDebugMessageDec("process",2,
 			"<= WxBlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
@@ -536,52 +438,95 @@ namespace bbtk
   /// Main processing method of the box.
   IOStatus WxBlackBox::bbBackwardUpdate( Connection::Pointer caller )
   {
-    bbtkDebugMessageInc("Process",1,
-			"=> WxBlackBox::bbBackwardUpdate("
-			<<(caller?caller->GetFullName():"0")<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
-
-    if (bbGetExecuting()) 
+    bbtkDebugMessage("process",3,
+		     "=> WxBlackBox::bbBackwardUpdate("
+		     <<(caller?caller->GetFullName():"0")<<") ["
+		     <<bbGetFullName()<<"]"<<std::endl);
+    // If the caller's box to is not the box to connected to the 
+    // output 'Widget'
+    if ( ! (( bbGetStatus() == MODIFIED ) ||
+	    ( bbBoxProcessModeIsAlways() )) )
       {
-	bbtkWarning(bbGetFullName()<<" : Cyclic execution stopped");
-	return UPTODATE;
+	bbtkDebugMessage("process",3,"Up-to-date : nothing to do"<<std::endl);
+	bbtkDebugMessage("process",3,
+			 "<= WxBlackBox::bbBackwardUpdate("
+			 <<(caller?caller->GetFullName():"0")<<") ["
+			 <<bbGetFullName()<<"]"<<std::endl);
+	return bbGetStatus();
       }
-    bbSetExecuting(true);
+ 
+    BlackBox::OutputConnectorMapType::const_iterator i 
+      = bbGetOutputConnectorMap().find("Widget") ;
+    if ( i->second->GetConnectionVector().size() != 0 )
+      
+      {
+	BlackBox::Pointer to = 
+	  i->second->GetConnectionVector()[0]->GetBlackBoxTo();
+		
+	if (caller) 
+	  {
+	    bbtkDebugMessage("process",3,
+			     "-> Output 'Widget' connected to '"
+			     <<to->bbGetFullName()<<"' - caller->to = '"
+			     <<caller->GetBlackBoxTo()->bbGetFullName()
+			     <<"'"
+			     <<std::endl);
+	  }
+	else
+	  {
+	    bbtkDebugMessage("process",3,
+			     "-> Output 'Widget' connected to '"
+			     <<to->bbGetFullName()<<"'"
+			     <<std::endl);
+	  }
+	if ((caller==0) ||
+	    ((caller!=0) && 
+	     (caller->GetBlackBoxTo() != to))&&
+	    (!bbGetUpdateTransferedToParent())&&
+	    (to->bbGetStatus()!=UPDATING))
+	  {
+	    bbtkDebugMessage("process",3,
+			     "   ... Transfering update order to parent"
+			     <<std::endl);
+	    
+	    bbSetUpdateTransferedToParent(true);
+	    i->second->GetConnectionVector().front() //.lock()
+	      ->GetBlackBoxTo()->bbExecute(false);
+	  }
+	else
+	  {
+	    bbSetUpdateTransferedToParent(false);
+	    bbtkDebugMessage("process",3,
+			     "   ... No need to transfer to parent"
+			     <<std::endl);
+	  }
+      }
+    /*    
 
     // If the caller is not the connection to the output widget
     // and the output 'Widget' is connected then 
-    // we must execute the parent box
-    bool done = false;
+    // we must execute the parent box 
+    // but only one time 
+    // (this is the role of the flag UpdateTransferedToParent)
     if ( (caller==0) ||
 	 ((caller!=0)&&(caller->GetBlackBoxFromOutput()!="Widget"))
 	 )
       {
-	BlackBox::OutputConnectorMapType::const_iterator i 
-	  = bbGetOutputConnectorMap().find("Widget") ;
-	if ( 
-	    i->second->GetConnectionVector().size() != 0 ) 
-	  {
-	    bbtkDebugMessage("Process",2,
-			     "-> Output 'Widget' connected : transfering execution to parent"
-			     <<std::endl);
-	    
-	    i->second->GetConnectionVector().front().lock()
-	      ->GetBlackBoxTo()->bbExecute(false);
-	    done = true;
-	  }
       }
+    */
     // call 'standard' BlackBox execution method
-    if (!done) 
+    if (!bbGetUpdateTransferedToParent()) 
       { 
-	bbSetExecuting(false);
-	AtomicBlackBox::bbBackwardUpdate(caller);
+	  AtomicBlackBox::bbBackwardUpdate(caller);
       }
     
-    bbtkDebugMessageDec("Process",1,
+    bbtkDebugMessageDec("process",3,
 			"<= WxBlackBox::bbBackwardUpdate() ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
-    bbSetExecuting(false);
+   return bbGetStatus();
+     
+
   }
 
   //=========================================================================
@@ -590,6 +535,7 @@ namespace bbtk
     if (bbGetOutputWidget()==0) this->bbUserCreateWidget();
     this->bbUserProcess(); 
     bbShowWindow();
+    //    this->bbUserOnShow();
   }
   //=========================================================================
   
@@ -599,7 +545,7 @@ namespace bbtk
   /// (called after bbProcess during bbExecute)
   void WxBlackBox::bbShowWindow()
   {
-    bbtkDebugMessageInc("Process",1,"=> WxBlackBox::bbShowWindow() ["
+    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
  
     // If Event Handler for the widget does not exist or is obsolete : create it 
@@ -607,7 +553,7 @@ namespace bbtk
       {
 	if (bbGetWidgetEventHandler()==0)
 	  {
-	    bbtkDebugMessage("Process",3,
+	    bbtkDebugMessage("wx",3,
 			     "-> No widget event handler : creating one"
 			     <<std::endl);
 	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
@@ -616,7 +562,7 @@ namespace bbtk
 	else if ( ! bbGetWidgetEventHandler()->IsHandlerOf 
 		  ( bbGetOutputWidget() ) )
 	  {
-	    bbtkDebugMessage("Process",3,
+	    bbtkDebugMessage("wx",3,
 			     "-> Obsolete widget event handler : re-creating one"
 			     <<std::endl);
 	    delete bbGetWidgetEventHandler();
@@ -633,10 +579,9 @@ namespace bbtk
 	 ->GetConnectionVector().size() != 0 ) 
       {
 	
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("wx",2,
 			 "-> Output 'Widget' connected : nothing to do"
 			 <<std::endl);
-	bbtkDebugDecTab("Process",1);
 	return;
       }
 
@@ -645,7 +590,7 @@ namespace bbtk
     // If the window already exists : no need creating it
     if (bbGetWindow()!=0)
       {
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("wx",2,
 			 "-> Window already exists"
 			 <<std::endl);
 	show = bbGetWindow();
@@ -653,7 +598,7 @@ namespace bbtk
     // Else if the widget exists : create window 
     else if (bbGetOutputWidget()!=0) 
       {
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("wx",2,
 			 "-> Widget exists : creating the window"
 			 <<std::endl);
 
@@ -661,7 +606,7 @@ namespace bbtk
 	// Input WinDialog set to true : creating a Dialog
 	if (bbGetInputWinDialog()) 
 	  {
-	    bbtkDebugMessage("Process",2,
+	    bbtkDebugMessage("wx",2,
 			     "   Input WinDialog set to true : creating a Dialog"
 			     <<std::endl);
 	    show = (Window*) new WxBlackBoxDialog( GetThisPointer<WxBlackBox>(),
@@ -672,7 +617,7 @@ namespace bbtk
 	// Input WinDialog set to false : creating a Frame
 	else 
 	  {
-	    bbtkDebugMessage("Process",2,
+	    bbtkDebugMessage("process",2,
 			     "   Input WinDialog set to false : creating a Frame"
 			     <<std::endl);
 	    show = (Window*) new WxBlackBoxFrame( GetThisPointer<WxBlackBox>(),
@@ -698,13 +643,13 @@ namespace bbtk
       }
     else 
       {
-	bbtkDebugMessage("Process",2,"-> Already shown : nothing to do"<<std::endl);
+	bbtkDebugMessage("wx",2,"-> Already shown : nothing to do"<<std::endl);
       }
   
 
-    bbtkDebugMessage("Process",1,"<= WxBlackBox::bbShowWindow() ["
+    bbtkDebugMessage("wx",1,"<= WxBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
-    bbtkDebugDecTab("Process",1);
+
   }
   //==================================================================
 
@@ -714,17 +659,30 @@ namespace bbtk
   //==================================================================
    void WxBlackBox::bbHideWindow()
   {
-    bbtkDebugMessageInc("Process",1,"=> WxBlackBox::bbHideWindow() ["
+    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbHideWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
     if (bbGetWindow()!=0) bbGetWindow()->bbHide();
 
-    bbtkDebugMessageDec("Process",1,"<= WxBlackBox::bbHideWindow() ["
+    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbHideWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
 
 
+  //==================================================================
+   void WxBlackBox::bbCloseWindow()
+  {
+    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbCloseWindow() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+
+    if (bbGetWindow()!=0) bbGetWindow()->bbClose();
+
+    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbCloseWindow() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+  }
+  //==================================================================
+
   //==================================================================
   WxBlackBox::Window* WxBlackBox::bbGetContainingWindow()
   {
@@ -734,8 +692,8 @@ namespace bbtk
     if ( i->second->GetConnectionVector().size() != 0 ) 
       {
 	return boost::static_pointer_cast<WxBlackBox>
-	  (i->second->GetConnectionVector().front().lock()->GetBlackBoxTo())
-	  ->bbGetContainingWindow();
+	  (i->second->GetConnectionVector().front() //.lock()
+	   ->GetBlackBoxTo())->bbGetContainingWindow();
       }
     return 0;
   }