X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=4ccfe67a2b8661f5416806620cb545ef5aad00fd;hb=911e9825791b3ed1777a80ffc1185970bd051193;hp=9e2507ac0e92d06249fe4588db37a368abb8837f;hpb=aeafe748c859675cf481bd9e5e5a5afa84a3fa52;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 9e2507a..4ccfe67 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/28 14:32:54 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/12/08 12:54:27 $
+  Version:   $Revision: 1.33 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 #ifdef _USE_WXWIDGETS_
 
 
@@ -26,6 +39,8 @@
  */
  
 #include "bbtkWxBlackBox.h"
+#include "bbtkBlackBoxOutputConnector.h"
+
 //#include "bbtkWxContainerBlackBox.h"
 #include <wx/dialog.h>
 
@@ -38,59 +53,6 @@
 namespace bbtk
 {
 
-  //=========================================================================
-  wxWindow* WxBlackBox::bbGlobalGetTopWindow() 
-  {
-    return bbmgTopWindow;
-  }
-  //=========================================================================
-
-  //=========================================================================
-  void WxBlackBox::bbGlobalSetTopWindow(wxWindow* w) 
-  {
-    if ( bbmgTopWindow ) 
-      {
-	bbtkGlobalError("WxBlackBox::bbGlobalSetTopWindow : top window already set !");
-      } 
-    bbmgTopWindow = w;
-  }
-  //=========================================================================
-   
-
-  //=========================================================================
-  void WxBlackBox::bbGlobalDecNbWindowsAlive()
-  { 
-    bbmgNbWindowsAlive--; 
-    /*
-    if ( (bbmgNbWindowsAlive==0) && 
-	 bbmgTopWindow && (!bbmgTopWindow->IsShown()))
-      {
-	bbmgTopWindow->Close();
-      }
-    */
-  }
-  //=========================================================================
-
-  //=========================================================================
-  void WxBlackBox::bbGlobalDecNbWindowsShown()
-  { 
-    bbmgNbWindowsShown--; 
-    if ( (bbmgNbWindowsShown==0) && 
-	 bbmgTopWindow && (!bbmgTopWindow->IsShown()))
-      {
-	bbmgTopWindow->Close();
-      }
-  }
-  //=========================================================================
-
-  //=========================================================================
-  // Static members 
-  wxWindow* WxBlackBox::bbmgTopWindow =0;
-  int WxBlackBox::bbmgNbWindowsAlive = 0;
-  int WxBlackBox::bbmgNbWindowsShown = 0;
-  //=========================================================================
-
-
 
 
 
@@ -101,43 +63,38 @@ namespace bbtk
 
 
   //=========================================================================
-  WxBlackBoxWindow::WxBlackBoxWindow(WxBlackBox* box)
+  WxBlackBoxWindow::WxBlackBoxWindow(WxBlackBox::Pointer box)
     : mBox(box), mShown(false)
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::WxBlackBoxWindow("<<
-		     mBox->bbGetFullName()<<")"<<std::endl);
-    mBox->bbSetWindow(this);
-    WxBlackBox::bbGlobalIncNbWindowsAlive();
-    bbtkDebugMessage("Wx",9," -> Number of windows alive = "
-		     <<WxBlackBox::bbGlobalGetNbWindowsAlive()<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxWindow::WxBlackBoxWindow("<<
+		     mBox.lock()->bbGetFullName()<<")"<<std::endl);
+    mBox.lock()->bbSetWindow(this);
+    Wx::IncNbWindowsAlive();
   }
   //=========================================================================
 
   //=========================================================================
   WxBlackBoxWindow::~WxBlackBoxWindow()
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::~WxBlackBoxWindow() ["<<
-		     mBox->bbGetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("wx",9,"WxBlackBoxWindow::~WxBlackBoxWindow() "
+		     <<this<<std::endl);
     bbHide();
-    mBox->bbSetWindow(0);
-    WxBlackBox::bbGlobalDecNbWindowsAlive();
-    bbtkDebugMessage("Wx",9," -> Number of windows alive = "
-		     <<WxBlackBox::bbGlobalGetNbWindowsAlive()<<std::endl);
-     
-
+    Wx::DecNbWindowsAlive();
+    if (!mBox.expired())
+      {
+	mBox.lock()->bbSetWindow(0);
+      }
   }
   //========================================================================= 
 
+
   //=========================================================================
   void WxBlackBoxWindow::bbShow()
   {
     if (bbIsShown()) return;
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::bbShow() ["<<
-		     mBox->bbGetFullName()<<"]"<<std::endl);
-    WxBlackBox::bbGlobalIncNbWindowsShown();
+    bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbShow()"<<std::endl);
+    Wx::IncNbWindowsShown();
     mShown = true;
-    bbtkDebugMessage("Wx",9," -> Number of windows shown = "
-		     <<WxBlackBox::bbGlobalGetNbWindowsShown()<<std::endl);
   }
   //=========================================================================
 
@@ -145,15 +102,17 @@ namespace bbtk
   void WxBlackBoxWindow::bbHide()
   {
     if (!bbIsShown()) return;
-    bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::bbHide() ["<<
-		     mBox->bbGetFullName()<<"]"<<std::endl);
-    WxBlackBox::bbGlobalDecNbWindowsShown();
+    bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbHide()"<<std::endl);
+    Wx::DecNbWindowsShown();
     mShown = false;
-    bbtkDebugMessage("Wx",9," -> Number of windows shown = "
-		     <<WxBlackBox::bbGlobalGetNbWindowsShown()<<std::endl);
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxWindow::bbClose()
+  {
+  }
+  //=========================================================================
 
 
   //=========================================================================
@@ -161,12 +120,11 @@ namespace bbtk
   //=========================================================================
 
   //=========================================================================
-  WxBlackBoxDialog::WxBlackBoxDialog(WxBlackBox* box,
+  WxBlackBoxDialog::WxBlackBoxDialog(WxBlackBox::Pointer box,
 				     wxWindow *parent,
 				     wxString title,
 				     wxSize size)
     :
-    WxBlackBoxWindow(box),
     wxDialog( parent, 
 		-1, 
 		title,
@@ -178,15 +136,18 @@ namespace bbtk
 		wxMAXIMIZE_BOX | 
 		wxMINIMIZE_BOX | 
 		wxCAPTION  
-		)
+	      ),
+    WxBlackBoxWindow(box)
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<<
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
 		     <<title<<",size)"<<std::endl);
     // Insert the widget into the window
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+	  // LG 22/11/08 : new widget pipeline
+	  bbGetBlackBox()->bbCreateWidgetAndEventHandler(this);
     wxWindow* widget = bbGetBlackBox()->bbGetOutputWidget();
-    widget->Reparent(this);
+// old :    widget->Reparent(this);
     sizer->Add( widget, 1, wxALL|wxEXPAND, 2);
     //SetAutoLayout(true);
     SetSizer(sizer);
@@ -197,23 +158,32 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxDialog::bbShow()
   { 
-    bbtkDebugMessage("Wx",5,"WxBlackBoxDialog::bbShow() ["
+    if (bbIsShown()) return;
+    bbtkDebugMessage("wx",5,"WxBlackBoxDialog::bbShow() ["
 		     <<bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
     WxBlackBoxWindow::bbShow();
     SetReturnCode( wxDialog::ShowModal() ); 
+    bbClose();
   }
   //=========================================================================
 
   //=========================================================================
   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()
+  {
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::bbClose()"<<std::endl);
+    wxDialog::Destroy();
+  }
+  //=========================================================================
+
   //=========================================================================
   WxBlackBoxDialog::~WxBlackBoxDialog()
   {
@@ -229,12 +199,11 @@ namespace bbtk
   //=========================================================================
 
   //=========================================================================
-  WxBlackBoxFrame::WxBlackBoxFrame(WxBlackBox* box,
+  WxBlackBoxFrame::WxBlackBoxFrame(WxBlackBox::Pointer box,
 				   wxWindow *parent,
 				   wxString title,
 				   wxSize size)
-    : WxBlackBoxWindow(box),
-      wxFrame( parent, 
+    :  wxFrame( parent, 
 	       -1, 
 	       title,
 	       wxDefaultPosition,
@@ -245,16 +214,19 @@ namespace bbtk
 	       wxMAXIMIZE_BOX | 
 	       wxMINIMIZE_BOX | 
 	       wxCAPTION  
-	       )
+		),
+       WxBlackBoxWindow(box)
   {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxFrame::WxBlackBoxFrame("<<
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::WxBlackBoxFrame("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
 		     <<title<<",size)"<<std::endl);
     // Insert the widget into the window
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+	  // LG 22/11/08 : new widget pipeline
+	  bbGetBlackBox()->bbCreateWidgetAndEventHandler(this);
     wxWindow* widget = bbGetBlackBox()->bbGetOutputWidget();
     wxFrame* frame = (wxFrame*)this;
-    widget->Reparent(frame);
+// old :    widget->Reparent(frame);
     sizer->Add( widget, 1, wxALL|wxGROW, 2);
     //  frame->SetAutoLayout(true);
     frame->SetSizer(sizer);
@@ -272,95 +244,43 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxFrame::bbShow() 
   { 
-    bbtkDebugMessage("Wx",5,"WxBlackBoxFrame::bbShow("
+    if (bbIsShown()) return;
+    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**)
 
-  //=========================================================================
-  void WxBlackBoxFrame::bbHide()
-  {
-    bbtkDebugMessage("Wx",9,"WxBlackBoxFrame::bbHide() ["<<
-		     bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
-    WxBlackBoxWindow::bbHide();
-    Hide();
-  }
-  //=========================================================================
 
+#if defined(_WIN32)
+      wxFrame::Refresh();
+#endif
 
-
-  //=========================================================================
-  // WxBlackBoxDialogWrapper
-  //=========================================================================
-  /*
-  //=========================================================================
-  WxBlackBoxDialogWrapper::WxBlackBoxDialogWrapper(WxBlackBox* box,
-						   wxDialog *wrapped) 
-    : WxBlackBoxWindow(box),
-      mWrapped(wrapped) 
-  {
-    bbtkDebugMessage("Wx",9,
-		     "WxBlackBoxDialogWrapper::WxBlackBoxDialogWrapper("
-		     <<bbGetBlackBox()->bbGetFullName()<<","<<wrapped
-		     <<")"<<std::endl);
-  }
-  //=========================================================================
-
-  //=========================================================================
-  WxBlackBoxDialogWrapper::~WxBlackBoxDialogWrapper()
-  {
-  }
-  //=========================================================================
-
-  //=========================================================================
-  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);
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::bbClose()"<<std::endl);
+    wxFrame::Close();
   }
   //=========================================================================
-  */
 
 
 
@@ -369,16 +289,16 @@ namespace bbtk
   //=========================================================================
 
   //=========================================================================
-  WxBlackBoxWidgetEventHandler::WxBlackBoxWidgetEventHandler( WxBlackBox* box, 
-							      wxWindow *widget )
+  WxBlackBoxWidgetEventHandler::
+  WxBlackBoxWidgetEventHandler( WxBlackBox::Pointer box, 
+				wxWindow *widget )
     :
     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,
@@ -394,22 +314,23 @@ 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);
+    // LGSIGNAL
+    //    mBox.lock()->bbSetModifiedStatus();
   }
   //=========================================================================
 
@@ -419,46 +340,6 @@ namespace bbtk
 
 
 
-  /*
-  //=========================================================================
-  wxWindow* WxParentToChildData::GetWindowInWhichToInsert( const BlackBox* b)
-    const
-  {
-    bbtkDebugMessageInc("Core",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("Core",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("Core",9);
-    return j->second;
-  }
-  //=========================================================================
-  */
-  
   //=========================================================================
   // WxBlackBox
   //=========================================================================
@@ -467,21 +348,21 @@ namespace bbtk
   //=========================================================================
   //=========================================================================
   //=========================================================================
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(WxBlackBox,UserBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(WxBlackBox,AtomicBlackBox);
   //=========================================================================
   
   //=========================================================================
   void WxBlackBox::bbUserConstructor()
   {
-    bbtkDebugMessage("Core",9,"WxBlackBox::bbUserConstructor()"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserConstructor()"<<std::endl);
     bbInitAttributes();
   }
   //=========================================================================
 
   //=========================================================================
-  void WxBlackBox::bbUserCopyConstructor()
+  void WxBlackBox::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
   {
-    bbtkDebugMessage("Core",9,"WxBlackBox::bbUserCopyConstructor()"
+    bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserCopyConstructor()"
 		     <<std::endl);
     bbInitAttributes();
   }
@@ -491,12 +372,12 @@ namespace bbtk
   //=========================================================================
   void WxBlackBox::bbUserDestructor()
   {
-    bbtkDebugMessage("Core",9,"WxBlackBox::bbUserDestructor()"<<std::endl);
+    bbtkDebugMessage("wx",9,"==> WxBlackBox::bbUserDestructor() ["<<bbGetFullName()<<"]"<<std::endl);
     if (bbGetWindow()) {
       delete bbGetWindow();
-      //      bbSetWindow(0);
+      bbSetWindow(0);
     }
-    bbtkDebugMessage("Core",9,"EO WxBlackBox::bbUserDestructor()"<<std::endl);
+    bbtkDebugMessage("wx",9,"<== WxBlackBox::bbUserDestructor() ["<<bbGetFullName()<<"]"<<std::endl);
   }
   //=========================================================================
   
@@ -507,7 +388,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();
@@ -529,25 +410,187 @@ namespace bbtk
     bbmWindow = 0;
     //    bbmWidget = 0;
     //    bbSetInputWinParent(0);
-    bbSetInputWinTitle("...");
+    bbSetInputWinTitle(bbGetName());
     bbSetInputWinWidth(800);
     bbSetInputWinHeight(800);
     bbSetInputWinDialog(false);
     bbSetOutputWidget(0);
 
     bbSetWidgetEventHandler(0);
+    //    bbSetUpdateTransferedToParent(false);
   }
   //=========================================================================
 
+  //=========================================================================
+  /// Main processing method of the box.
+  void WxBlackBox::bbExecute(bool force)
+  {
+    
+    bbtkDebugMessageInc("process",2,
+			"=> WxBlackBox::bbExecute("<<(int)force<<") ["
+			<<bbGetFullName()<<"]"<<std::endl);
+    
+    
+    // If the output 'Widget' is connected then 
+    // we must execute the parent box
+    BlackBox::OutputConnectorMapType::const_iterator i 
+      = bbGetOutputConnectorMap().find("Widget");
+    
+    if ( i->second->GetConnectionVector().size() != 0 ) 
+      {
+	bbtkWarning("Execution called on '"<<bbGetFullName()
+		    <<"' although its Output 'Widget' is connected: "
+		    <<"if the widget is not created yet then it will not be! "
+		    <<"Execute the top level Layout widget to create and "
+		    <<"display the widget.");
+      }
+
+    AtomicBlackBox::bbExecute(force);
+
+    bbtkDebugMessageDec("process",2,
+			"<= WxBlackBox::bbExecute() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+  }
+  //=========================================================================
 
 
+  //=========================================================================
+  void WxBlackBox::bbProcess()
+  { 
+/*
+	  if (bbGetOutputWidget()==0) this->bbUserCreateWidget();
+	  this->bbUserProcess(); 
+	  bbShowWindow();
+	  //    this->bbUserOnShow();
+	  */
+    // LG 22/11/08 : new widget pipeline
+    // If output widget not connected : 
+    if ( (*bbGetOutputConnectorMap().find("Widget")).second
+	 ->GetConnectionVector().size() == 0 ) 
+      {
+	Window* show = 0;
+	// If the window already exists : no need creating it
+	if (bbGetWindow()!=0)
+	  {
+	    bbtkDebugMessage("wx",2,
+			     "-> Window already exists"
+			     <<std::endl);
+	    show = bbGetWindow();
+	  }
+	// Else create window 
+	else 
+	  {
+	    bbtkDebugMessage("wx",2,
+			     "-> Creating the window"
+			     <<std::endl);
+	    
+	    
+	    // Input WinDialog set to true : creating a Dialog
+	    if (bbGetInputWinDialog()) 
+	      {
+		bbtkDebugMessage("wx",2,
+				 "   Input WinDialog set to true : creating a Dialog"
+				 <<std::endl);
+		show = (Window*) new WxBlackBoxDialog( GetThisPointer<WxBlackBox>(),
+						       // bbGetWxParent(), 
+						       // LG 24/11/08 : New widget pipeline
+						       Wx::GetTopWindow(),
+						       std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS LRMN"),
+						       wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) );
+	      }
+	    // Input WinDialog set to false : creating a Frame
+	    else 
+	      {
+		bbtkDebugMessage("process",2,
+				 "   Input WinDialog set to false : creating a Frame"
+				 <<std::endl);
+		show = (Window*) new WxBlackBoxFrame( GetThisPointer<WxBlackBox>(),
+						      // bbGetWxParent(), 
+						      // LG 24/11/08 : New widget pipeline
+						      Wx::GetTopWindow(),
+						      std2wx( bbGetInputWinTitle()  + " - bbtk (c) CREATIS LRMN"),
+						      wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) );
+	      }
+	    
+	  }
+	
+	// Show the window
+	show->bbShow(); 
+	
+	
+      }		  
+    this->bbUserProcess(); 
+    
+  }
+  //=========================================================================
+ 
+	
+	
+  // LG 24/11/08 : New widget pipeline
+  void WxBlackBox::bbCreateWidgetAndEventHandler(wxWindow* parent)
+  {
+    if (bbGetOutputWidget()==0)
+      {
+	this->bbUserCreateWidget(parent);
+      }		
+    // If Event Handler for the widget does not exist or is obsolete : create it 
+    if (bbGetOutputWidget()!=0)
+      {
+	if (bbGetWidgetEventHandler()==0)
+	  {
+	    bbtkDebugMessage("wx",3,
+			     "-> No widget event handler : creating one"
+			     <<std::endl);
+	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
+					     bbGetOutputWidget());
+	  }
+	else if ( ! bbGetWidgetEventHandler()->IsHandlerOf 
+		  ( bbGetOutputWidget() ) )
+	  {
+	    bbtkDebugMessage("wx",3,
+			     "-> Obsolete widget event handler : re-creating one"
+			     <<std::endl);
+	    delete bbGetWidgetEventHandler();
+	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
+					     bbGetOutputWidget());
+	  }
+	// Sets the name of the wxWindow to the input WinTitle
+	bbGetOutputWidget()->SetName(bbtk::std2wx(bbGetInputWinTitle()));
+      }
+    
+    
+  }
+  
+  
+  
+  wxWindow*  WxBlackBox::bbCreateWidgetOfInput(const std::string& in, wxWindow* parent)
+  {
+    wxWindow* w = 0;
+    // If input is connected 
+    BlackBoxInputConnector* c = bbGetInputConnectorMap().find(in)->second ;
+    if ( c->IsConnected() )			
+      {
+	// Get black box from 
+	BlackBox::Pointer from = 
+	  c->GetConnection()->GetBlackBoxFrom();
+	// Cast it into a WxBlackBox
+	WxBlackBox::Pointer wfrom = boost::dynamic_pointer_cast<WxBlackBox>(from);
+	// Call bbCreateWidgetAndEventHandler
+	wfrom->bbCreateWidgetAndEventHandler(parent);
+	// Get the widget created
+	w = wfrom->bbGetOutputWidget();
+      }
+    return w;
+  }
+  
+  /*
   //==================================================================
   /// Specific methods for window creation during pipeline execution
   /// Shows the window associated to the box 
   /// (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 
@@ -555,20 +598,24 @@ namespace bbtk
       {
 	if (bbGetWidgetEventHandler()==0)
 	  {
-	    bbtkDebugMessage("Process",3,
+	    bbtkDebugMessage("wx",3,
 			     "-> No widget event handler : creating one"
 			     <<std::endl);
-	    new WxBlackBoxWidgetEventHandler(this,bbGetOutputWidget());
+	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
+					     bbGetOutputWidget());
 	  }
 	else if ( ! bbGetWidgetEventHandler()->IsHandlerOf 
 		  ( bbGetOutputWidget() ) )
 	  {
-	    bbtkDebugMessage("Process",3,
+	    bbtkDebugMessage("wx",3,
 			     "-> Obsolete widget event handler : re-creating one"
 			     <<std::endl);
 	    delete bbGetWidgetEventHandler();
-	    new WxBlackBoxWidgetEventHandler(this,bbGetOutputWidget());
+	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
+					     bbGetOutputWidget());
 	  }
+	// Sets the name of the wxWindow to the input WinTitle
+	bbGetOutputWidget()->SetName(bbtk::std2wx(bbGetInputWinTitle()));
       }
 
     // If the output 'Widget' is connected then it's gonna 
@@ -577,10 +624,9 @@ namespace bbtk
 	 ->GetConnectionVector().size() != 0 ) 
       {
 	
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("wx",2,
 			 "-> Output 'Widget' connected : nothing to do"
 			 <<std::endl);
-	bbtkDebugDecTab("Process",1);
 	return;
       }
 
@@ -589,7 +635,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();
@@ -597,7 +643,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);
 
@@ -605,22 +651,26 @@ 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( this,
-						   bbGlobalGetTopWindow(), 
+	    show = (Window*) new WxBlackBoxDialog( GetThisPointer<WxBlackBox>(),
+						  // bbGetWxParent(), 
+											  // LG 24/11/08 : New widget pipeline
+											  Wx::GetTopWindow(),
 						   std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS LRMN"),
 						   wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) );
 	  }
 	// 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( this,
-						  bbGlobalGetTopWindow(), 
+	    show = (Window*) new WxBlackBoxFrame( GetThisPointer<WxBlackBox>(),
+						  // bbGetWxParent(), 
+											 // LG 24/11/08 : New widget pipeline
+											 Wx::GetTopWindow(),
 						  std2wx( bbGetInputWinTitle()  + " - bbtk (c) CREATIS LRMN"),
 						  wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) );
 	  }
@@ -642,33 +692,77 @@ 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",2,"<= WxBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
-    bbtkDebugDecTab("Process",1);
+
   }
   //==================================================================
-
+*/
 
 
 
   //==================================================================
    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",2,"<= WxBlackBox::bbHideWindow() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+  }
+  //==================================================================
+
+
+  //==================================================================
+   void WxBlackBox::bbCloseWindow()
+  {
+    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbCloseWindow() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+
+    if (bbGetWindow()!=0) bbGetWindow()->bbClose();
+
+    bbtkDebugMessageDec("wx",2,"<= WxBlackBox::bbCloseWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
 
+  //==================================================================
+  WxBlackBox::Window* WxBlackBox::bbGetContainingWindow()
+  {
+    if (bbGetWindow()!=0) return bbGetWindow();
+    BlackBox::OutputConnectorMapType::const_iterator i 
+      = bbGetOutputConnectorMap().find("Widget");
+    if ( i->second->GetConnectionVector().size() != 0 ) 
+      {
+	return boost::static_pointer_cast<WxBlackBox>
+	  (i->second->GetConnectionVector().front() //.lock()
+	   ->GetBlackBoxTo())->bbGetContainingWindow();
+      }
+    return 0;
+  }
+  //==================================================================
+
 
+  //==================================================================
+	// LG 24/11/08 : New widget pipeline
+	//  wxWindow* WxBlackBox::bbGetWxParent() { return Wx::GetTopWindow(); }
+  //==================================================================
+  
+  
+  //==================================================================
+  bool WxBlackBox::bbIsShown()
+  {
+    if (bbGetContainingWindow()!=0)
+      return bbGetContainingWindow()->bbIsShown();
+    return false;
+  }
+  //==================================================================
 
 
 }//namespace bbtk