LayoutLine

diff --git a/packages/wx/bbs/appli/testNotebook.bbs b/packages/wx/bbs/appli/testNotebook.bbs
index f7b38b6dd0cd101e71e0976e3d83dfc8205a32c7..6d86214db22066d6fdcb43de8863559e7e5d8749 100644 (file)
--- a/packages/wx/bbs/appli/testNotebook.bbs
+++ b/packages/wx/bbs/appli/testNotebook.bbs
@@ -1,6 +1,6 @@
-description "Simple test of wx::Sizer widget"
+description "Simple test of wx::Layout widget"
 author "eduardo.davila@creatis.insa-lyon.fr"
-category "test;widget"
+category "example;widget"
 
 load wx
 
@@ -8,7 +8,7 @@ new Slider slider1
 new Slider slider2
 new Slider slider3
 new Sizer  sizer
-new Notebook main
+new LayoutTab main
 
 connect slider2.Widget sizer.Widget1
 connect slider3.Widget sizer.Widget2

diff --git a/packages/wx/bbs/appli/testNotebook2.bbs b/packages/wx/bbs/appli/testNotebook2.bbs
index e02f2924fc460b86317f7f35c665f1dee109d464..e1f9b6daa92f27f5dc2cd996f6b24f6f9a7ae11a 100644 (file)
--- a/packages/wx/bbs/appli/testNotebook2.bbs
+++ b/packages/wx/bbs/appli/testNotebook2.bbs
@@ -1,6 +1,6 @@
-description "Simple test of wx::Sizer widget"
+description "Simple test of wx::LayoutTab widget"
 author "eduardo.davila@creatis.insa-lyon.fr"
-category "test;widget"
+category "example;widget"
 
 load wx
 
@@ -8,7 +8,7 @@ new Slider slider1
 new Slider slider2
 new Slider slider3
 new Sizer  sizer
-new Notebook main
+new LayoutTab main
 
 new Slider sA
 new Slider sB

diff --git a/packages/wx/src/bbwxSizer.cxx b/packages/wx/src/bbwxLayoutLine.cxx
similarity index 84%
rename from packages/wx/src/bbwxSizer.cxx
rename to packages/wx/src/bbwxLayoutLine.cxx
index c213d41483b22402ec8d49d8d20fe4fb2e593204..977404c1cafa7487464713f89ae27d8cc23d7de7 100644 (file)
--- a/packages/wx/src/bbwxSizer.cxx
+++ b/packages/wx/src/bbwxLayoutLine.cxx
@@ -1,10 +1,10 @@
 /*=========================================================================
                                                                                 
   Program:   bbtk
-  Module:    $RCSfile: bbwxSizer.cxx,v $
+  Module:    $RCSfile: bbwxLayoutLine.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/14 20:55:52 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/02/15 12:19:58 $
+  Version:   $Revision: 1.1 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,17 +23,17 @@
 
 #ifdef _USE_WXWIDGETS_
 
-#include "bbwxSizer.h"
+#include "bbwxLayoutLine.h"
 #include "bbwxPackage.h"
 #include "bbtkUtilities.h"
 
 
 namespace bbwx
 {
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, Sizer);
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(Sizer,bbtk::WxBlackBox);
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, LayoutLine);
+  BBTK_USER_BLACK_BOX_IMPLEMENTATION(LayoutLine,bbtk::WxBlackBox);
 
-       void Sizer::bbUserConstructor()
+       void LayoutLine::bbUserConstructor()
        {
                bbSetInputOrientation("VERTICAL");
                bbSetInputWidget1(NULL);
@@ -47,11 +47,11 @@ namespace bbwx
                bbSetInputWidget9(NULL);
        }
 
-         void Sizer::Process()
+         void LayoutLine::Process()
          {
          }
 
-       void Sizer::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
+       void LayoutLine::TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer)
        {
                  if (w!=NULL)
                  {
@@ -60,7 +60,7 @@ namespace bbwx
                  }
        }
 
-         void Sizer::CreateWidget()
+         void LayoutLine::CreateWidget()
          {
          wxBoxSizer *sizer;
          wxPanel *w=new wxPanel(bbGetWxParent(), -1);

diff --git a/packages/wx/src/bbwxSizer.h b/packages/wx/src/bbwxLayoutLine.h
similarity index 67%
rename from packages/wx/src/bbwxSizer.h
rename to packages/wx/src/bbwxLayoutLine.h
index 863deb429ebaa9c83c93fa34b9a54709cb1e3b4d..069811e9f544109700443f34fb66386f074af269 100644 (file)
--- a/packages/wx/src/bbwxSizer.h
+++ b/packages/wx/src/bbwxLayoutLine.h
@@ -1,10 +1,10 @@
 /*=========================================================================
                                                                                 
   Program:   bbtk
-  Module:    $RCSfile: bbwxSizer.h,v $
+  Module:    $RCSfile: bbwxLayoutLine.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/08 14:58:31 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/02/15 12:19:58 $
+  Version:   $Revision: 1.1 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,8 +33,8 @@
 #ifdef _USE_WXWIDGETS_
 
 
-#ifndef __bbWxSizer_h__
-#define __bbWxSizer_h__
+#ifndef __bbWxLayoutLine_h__
+#define __bbWxLayoutLine_h__
 
 #include "bbtkWxBlackBox.h"
 
@@ -46,10 +46,10 @@ namespace bbwx
 
   
   
-  class /*BBTK_EXPORT*/ Sizer : public bbtk::WxBlackBox
+  class /*BBTK_EXPORT*/ LayoutLine : public bbtk::WxBlackBox
   {
     
-    BBTK_USER_BLACK_BOX_INTERFACE(Sizer,bbtk::WxBlackBox);
+    BBTK_USER_BLACK_BOX_INTERFACE(LayoutLine,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(Widget1,wxWindow*);
     BBTK_DECLARE_INPUT(Widget2,wxWindow*);
     BBTK_DECLARE_INPUT(Widget3,wxWindow*);
@@ -75,23 +75,23 @@ namespace bbwx
  
 //=================================================================
 // BlackBox description
-  BBTK_BEGIN_DESCRIBE_BLACK_BOX(Sizer,bbtk::WxBlackBox);
-  BBTK_NAME("Sizer");
+  BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutLine,bbtk::WxBlackBox);
+  BBTK_NAME("LayoutLine");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Sizer widget (wxSizer)");
+  BBTK_DESCRIPTION("LayoutLine widget (wxBoxSizer)");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   
-  BBTK_INPUT(Sizer,Widget1,"widget 1",wxWindow*);
-  BBTK_INPUT(Sizer,Widget2,"widget 2",wxWindow*);
-  BBTK_INPUT(Sizer,Widget3,"widget 3",wxWindow*);
-  BBTK_INPUT(Sizer,Widget4,"widget 4",wxWindow*);
-  BBTK_INPUT(Sizer,Widget5,"widget 5",wxWindow*);
-  BBTK_INPUT(Sizer,Widget6,"widget 6",wxWindow*);
-  BBTK_INPUT(Sizer,Widget7,"widget 7",wxWindow*);
-  BBTK_INPUT(Sizer,Widget8,"widget 8",wxWindow*);
-  BBTK_INPUT(Sizer,Widget9,"widget 9",wxWindow*);
-  BBTK_INPUT(Sizer,Orientation,"Orientation (default V), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string);
-  BBTK_END_DESCRIBE_BLACK_BOX(Sizer);
+  BBTK_INPUT(LayoutLine,Widget1,"widget 1",wxWindow*);
+  BBTK_INPUT(LayoutLine,Widget2,"widget 2",wxWindow*);
+  BBTK_INPUT(LayoutLine,Widget3,"widget 3",wxWindow*);
+  BBTK_INPUT(LayoutLine,Widget4,"widget 4",wxWindow*);
+  BBTK_INPUT(LayoutLine,Widget5,"widget 5",wxWindow*);
+  BBTK_INPUT(LayoutLine,Widget6,"widget 6",wxWindow*);
+  BBTK_INPUT(LayoutLine,Widget7,"widget 7",wxWindow*);
+  BBTK_INPUT(LayoutLine,Widget8,"widget 8",wxWindow*);
+  BBTK_INPUT(LayoutLine,Widget9,"widget 9",wxWindow*);
+  BBTK_INPUT(LayoutLine,Orientation,"Orientation (default V), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string);
+  BBTK_END_DESCRIBE_BLACK_BOX(LayoutLine);
   //=================================================================
   
 
@@ -101,6 +101,6 @@ namespace bbwx
 
 
 //namespace bbtk
-#endif  //__bbtkWxSizer_h__
+#endif  //__bbtkWxLayoutLine_h__
 
 #endif //_USE_WXWIDGETS_