X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxLayoutLine.cxx;h=8b40107c218f7ce0d5c40379fee53d160139f486;hb=f346161adcdec4cf3dc3e1b8fac72a7bc43a5f50;hp=3d15b3f4da2b4873087850e9a148a202d6acc969;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx
index 3d15b3f..8b40107 100644
--- a/packages/wx/src/bbwxLayoutLine.cxx
+++ b/packages/wx/src/bbwxLayoutLine.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutLine.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/05/28 08:12:17 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -47,24 +47,38 @@ namespace bbwx
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, LayoutLine);
   BBTK_BLACK_BOX_IMPLEMENTATION(LayoutLine,bbtk::WxBlackBox);
   
-  void LayoutLine::bbUserConstructor()
-  {
-    bbSetInputOrientation("VERTICAL");
-    bbSetInputWidget1(NULL);
-    bbSetInputWidget2(NULL);
-    bbSetInputWidget3(NULL);
-    bbSetInputWidget4(NULL);
-    bbSetInputWidget5(NULL);
-    bbSetInputWidget6(NULL);
-    bbSetInputWidget7(NULL);
-    bbSetInputWidget8(NULL);
-    bbSetInputWidget9(NULL);
-  }
-  
+	//-----------------------------------------------------------------	
+	void LayoutLine::bbUserSetDefaultValues()
+	{
+		bbSetInputOrientation("VERTICAL");
+		bbSetInputWidget1(NULL);
+		bbSetInputWidget2(NULL);
+		bbSetInputWidget3(NULL);
+		bbSetInputWidget4(NULL);
+		bbSetInputWidget5(NULL);
+		bbSetInputWidget6(NULL);
+		bbSetInputWidget7(NULL);
+		bbSetInputWidget8(NULL);
+		bbSetInputWidget9(NULL);
+	}
+	
+	//-----------------------------------------------------------------	
+	void LayoutLine::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void LayoutLine::bbUserFinalizeProcessing()
+	{
+	}	
+	
+	
   void LayoutLine::Process()
   {
   }
   
+	
+/*
   void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
   {
     if (w!=NULL)
@@ -73,11 +87,13 @@ namespace bbwx
 	sizer->Add(w, 1, wxEXPAND, 0);
       }
   }
-  
-  void LayoutLine::CreateWidget()
+  */
+	
+  void LayoutLine::CreateWidget(wxWindow* parent)
   {
     wxBoxSizer *sizer;
-    wxPanel *w=new wxPanel(bbGetWxParent(), -1);
+    wxPanel *w=new wxPanel(parent, //bbGetWxParent(),
+						   -1);
     w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
     
     int style=0;
@@ -89,7 +105,18 @@ namespace bbwx
       { style=wxVERTICAL;   }
     
     sizer	= new wxBoxSizer(style);
-    
+
+	  wxWindow* cw;
+	if ((cw=bbCreateWidgetOfInput("Widget1",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  if ((cw=bbCreateWidgetOfInput("Widget2",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  if ((cw=bbCreateWidgetOfInput("Widget3",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  if ((cw=bbCreateWidgetOfInput("Widget4",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  if ((cw=bbCreateWidgetOfInput("Widget5",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  if ((cw=bbCreateWidgetOfInput("Widget6",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  if ((cw=bbCreateWidgetOfInput("Widget7",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  if ((cw=bbCreateWidgetOfInput("Widget8",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  if ((cw=bbCreateWidgetOfInput("Widget9",w)) != 0) sizer->Add(cw, 1, wxEXPAND, 0);
+	  /*
     TryInsertWindow(w,bbGetInputWidget1(),sizer);
     TryInsertWindow(w,bbGetInputWidget2(),sizer);
     TryInsertWindow(w,bbGetInputWidget3(),sizer);
@@ -99,24 +126,15 @@ namespace bbwx
     TryInsertWindow(w,bbGetInputWidget7(),sizer);
     TryInsertWindow(w,bbGetInputWidget8(),sizer);
     TryInsertWindow(w,bbGetInputWidget9(),sizer);
-    
+    */
     w	-> SetSizer(sizer);
     bbSetOutputWidget( w );
   }
   
   // This callback is necessary to get actual processing of the view 
   // when window is shown
-  void  LayoutLine::bbUserOnShow()
+  void  LayoutLine::OnShowWidget()
   {
-	  bbUserOnShowWidget("Widget1");
-	  bbUserOnShowWidget("Widget2");
-	  bbUserOnShowWidget("Widget3");
-	  bbUserOnShowWidget("Widget4");
-	  bbUserOnShowWidget("Widget5");
-	  bbUserOnShowWidget("Widget6");
-	  bbUserOnShowWidget("Widget7");
-	  bbUserOnShowWidget("Widget8");
-	  bbUserOnShowWidget("Widget9");
   }
 
 }//namespace bbwx