*** empty log message ***

[bbtk.git] / packages / wx / src / bbwxLayoutTab.cxx

diff --git a/packages/wx/src/bbwxLayoutTab.cxx b/packages/wx/src/bbwxLayoutTab.cxx
index 3bdfda97a092498224c4e8f90619afe587698a15..942320e01fc1456546c2e59fe4490da09d8e6cc9 100644 (file)
--- a/packages/wx/src/bbwxLayoutTab.cxx
+++ b/packages/wx/src/bbwxLayoutTab.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutTab.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/11/25 13:18:33 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -64,63 +64,70 @@ namespace bbwx
                bbSetInputWidget8(NULL);
                bbSetInputWidget9(NULL);
        }
-/*
-       void LayoutTab::TryInsertWindow(wxNotebook *book, wxWindow *widgetchild )
-       {
-                 if (widgetchild!=NULL)
-                 {
-                          widgetchild->Reparent(book);
-                          book->AddPage(widgetchild, widgetchild->GetName() );
-                          widgetchild->Show();
-                 }             
-       }
-*/
 
-       void LayoutTab::Process() 
-       { 
-       }
+  void LayoutTab::TryInsertWindow(wxNotebook *book, const std::string& input )
+  {
+    wxWindow* w = bbCreateWidgetOfInput(input,book); //panel);
+    if (w!=NULL)
+      {
+       book->AddPage(w,w->GetName());
+      }
+  }
 
-         
-       void LayoutTab::CreateWidget(wxWindow* parent) 
-       { 
-         long style = wxNB_TOP;
-         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|T|TOP")==true)     { style=wxNB_TOP; }
-         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|R|RIGHT")==true)   { style=wxNB_RIGHT; }
-         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"2|B|BOTTOM")==true)  { style=wxNB_BOTTOM; }
-         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"3|L|LEFT")==true)    { style=wxNB_LEFT; }
-         wxNotebook *w = new wxNotebook(parent, //bbGetWxParent(),
-                                                                        -1, wxDefaultPosition,wxDefaultSize,style );
-         w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
-                 /*
-         TryInsertWindow(w,bbGetInputWidget1());
-         TryInsertWindow(w,bbGetInputWidget2());
-         TryInsertWindow(w,bbGetInputWidget3());
-         TryInsertWindow(w,bbGetInputWidget4());
-         TryInsertWindow(w,bbGetInputWidget5());
-         TryInsertWindow(w,bbGetInputWidget6());
-         TryInsertWindow(w,bbGetInputWidget7());
-         TryInsertWindow(w,bbGetInputWidget8());
-         TryInsertWindow(w,bbGetInputWidget9());
-*/
-
-         bbSetOutputWidget( w );
-       }
+  void LayoutTab::Process() 
+  { 
+  }
+  
+  
+  void LayoutTab::CreateWidget(wxWindow* parent) 
+  { 
+    long style = wxNB_TOP;
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|T|TOP")==true) 
+      { style=wxNB_TOP; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|R|RIGHT")==true)
+      { style=wxNB_RIGHT; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"2|B|BOTTOM")==true)
+      { style=wxNB_BOTTOM; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"3|L|LEFT")==true)
+      { style=wxNB_LEFT; }
+    wxNotebook *w = new wxNotebook(parent, //bbGetWxParent(),
+                                  -1, 
+                                  wxDefaultPosition,
+                                  wxDefaultSize,
+                                  style );
+    w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+    
+    TryInsertWindow(w,"Widget1");
+    TryInsertWindow(w,"Widget2");
+    TryInsertWindow(w,"Widget3");
+    TryInsertWindow(w,"Widget4");
+    TryInsertWindow(w,"Widget5");
+    TryInsertWindow(w,"Widget6");
+    TryInsertWindow(w,"Widget7");
+    TryInsertWindow(w,"Widget8");
+    TryInsertWindow(w,"Widget9");
+    
+    bbSetOutputWidget( w );
+  }
+  
   
-
   // This callback is necessary to get actual processing of the view 
   // when window is shown
   void  LayoutTab::OnShowWidget()
   {
-         bbGetOutputWidget()->Show();
-         bbUserOnShowWidget("Widget1");
-         bbUserOnShowWidget("Widget2");
-         bbUserOnShowWidget("Widget3");
-         bbUserOnShowWidget("Widget4");
-         bbUserOnShowWidget("Widget5");
-         bbUserOnShowWidget("Widget6");
-         bbUserOnShowWidget("Widget7");
-         bbUserOnShowWidget("Widget8");
-         bbUserOnShowWidget("Widget9");
+    //bbGetOutputWidget()->Show();
+    
+    bbUserOnShowWidget("Widget1");
+    bbUserOnShowWidget("Widget2");
+    bbUserOnShowWidget("Widget3");
+    bbUserOnShowWidget("Widget4");
+    bbUserOnShowWidget("Widget5");
+    bbUserOnShowWidget("Widget6");
+    bbUserOnShowWidget("Widget7");
+    bbUserOnShowWidget("Widget8");
+    bbUserOnShowWidget("Widget9");
+    
+   
   }