X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fwx%2Fsrc%2FbbwxSizer.cxx;fp=packages%2Fwx%2Fsrc%2FbbwxSizer.cxx;h=e30cb2208727ff5d8645c1828b290a6d20eb5caf;hb=c336eef9abedc5bcea1aa1ad8cb43d53ab2e3039;hp=fab3e252aa000c56954ed11736a2e9ac889d4f46;hpb=001c522c9cd723fd522afda8a3882607c2565b85;p=bbtk.git

diff --git a/packages/wx/src/bbwxSizer.cxx b/packages/wx/src/bbwxSizer.cxx
index fab3e25..e30cb22 100644
--- a/packages/wx/src/bbwxSizer.cxx
+++ b/packages/wx/src/bbwxSizer.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSizer.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 13:23:47 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/02/05 18:05:32 $
+  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
@@ -35,55 +35,12 @@ namespace bbwx
 {
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx , Sizer);
   
-/*  
-  wxWidgetSizer::wxWidgetSizer(wxWindow *parent,int orientation)
-    : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
-  {
-    wxPanel			*panel	= this;
-
-	if (orientation==0)
-	{
-		mwxSizer	= new wxBoxSizer(wxHORIZONTAL);
-	} else {
-		mwxSizer	= new wxBoxSizer(wxVERTICAL);
-	} 
-
-	panel	-> SetSizer(mwxSizer);
-   panel	-> SetAutoLayout(true);
-   panel	-> Layout();
-    
-    mbbtkSizer=NULL;
-  }
-  //-------------------------------------------------------------------------
-  void  wxWidgetSizer::AddChild(wxWindow* child)
-  {
-    mwxSizer->Add(child, 1, wxEXPAND, 0);
-  }
-  
-  wxWidgetSizer::~wxWidgetSizer()
-  {
-  }
-  
-  //-------------------------------------------------------------------------
-  
-  void wxWidgetSizer::SetSizer(Sizer* bbtksizer)
-  {
-    mbbtkSizer = bbtksizer;
-  }
-  
-
-  
-  //--------------------------------------------------------------------------
-  //-------------------------------------------------------------------------
-  //--------------------------------------------------------------------------
-  //--------------------------------------------------------------------------
-
-*/
 
   BBTK_USER_BLACK_BOX_IMPLEMENTATION(Sizer,bbtk::WxBlackBox);
   
 	void Sizer::bbUserConstructor() 
 	{ 
+		bbSetInputWinTitle("Sizer");
 		bbSetInputOrientation(1);
 		bbSetInputWidget1(NULL);
 		bbSetInputWidget2(NULL);
@@ -116,6 +73,7 @@ namespace bbwx
 	  { 
 	  wxBoxSizer *sizer;
 	  wxPanel *w=new wxPanel(bbGetWxParent(), -1);
+	  w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
 	  if (bbGetInputOrientation()==0)
 	  {
 		  sizer	= new wxBoxSizer(wxHORIZONTAL);
@@ -134,58 +92,11 @@ namespace bbwx
 	  TryInsertWindow(w,bbGetInputWidget9(),sizer);
 	  TryInsertWindow(w,bbGetInputWidget10(),sizer);
 	  
-	  w	-> SetSizer(sizer);
-//	  w	-> SetAutoLayout(true);
-//	  w	-> Layout();
+	  w	-> SetSizer(sizer); 
 	  bbSetOutputWidget( w );
   }
   
 
-/*  
-  wxWindow *Sizer::CreateWxWindow(wxWindow *parent)
-  {
-    bbtkDebugMessageInc("Kernel",9,"Sizer::CreateWxWindow("<<parent<<")"<<std::endl);
-    
-    wxWidgetSizer *wxwidgetsizer = new wxWidgetSizer(parent,bbGetInputOrientation() );
-
-//    OutputConnectorMapType::iterator i = GetOutputConnectorMap().find("Child");  
-	OutputConnectorMapType::iterator i;
-	for (i=GetOutputConnectorMap().begin() ; i!=GetOutputConnectorMap().end(); ++i ){
-		if (i->first=="Child")
-		{
-			const std::vector<Connection*>& C = i->second->GetConnectionVector();
-			std::vector<Connection*>::const_iterator j;
-			for (j=C.begin(); j!=C.end(); ++j) 
-			{
-//				WxBlackBox* to = ((WxBlackBox*)((*j)->GetBlackBoxTo()));
-//				wxWindow* cw = ((WxBlackBox*)((*j)->GetBlackBoxTo()))->GetWxWindow(wxwidgetsizer);
-				wxPanel *cw = new wxPanel(wxwidgetsizer,-1);
-				cw->SetName( wxString( (*j)->GetBlackBoxTo()->bbGetName().c_str(), wxConvUTF8 ) );
-				wxwidgetsizer->AddChild(cw);
-			} // for j
-			break;
-		} // if Child
-	} // for i
-    //
-    wxwidgetsizer->SetSizer(this);
-    
-    bbtkDebugDecTab("Kernel",9);
-    
-	Setmwxcontainer(wxwidgetsizer);
-
-    return wxwidgetsizer;
-  }
-
-  void Sizer::AddWxBBChild(WxBlackBox *wxblackbox)  // virtual
-  {
-	wxWindow *subparent = GetSubParent( wxString(wxblackbox->bbGetName().c_str(),wxConvUTF8 ) );
-	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-	sizer -> Add( wxblackbox->GetWxWindow( subparent ) , 1, wxALL|wxEXPAND, 2);
-	subparent -> SetAutoLayout(true);
-	subparent -> SetSizer(sizer);
-	subparent -> Layout();
-  }
-*/