Clean Code

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

diff --git a/packages/wx/src/bbwxLayoutTab.cxx b/packages/wx/src/bbwxLayoutTab.cxx
index a93b5d8efa7770b84d880075a8b41a956aee859b..fac1678d5f3cceb919cd1f0c05ab8caa012056b5 100644 (file)
--- a/packages/wx/src/bbwxLayoutTab.cxx
+++ b/packages/wx/src/bbwxLayoutTab.cxx
@@ -76,15 +76,15 @@ namespace bbwx
     mwxNotebook        = new wxNotebook(panel, //bbGetWxParent(),
                                   -1, 
                                   wxDefaultPosition,
-                                  wxDefaultSize,
+//                                wxDefaultSize,
+                                     wxSize(50,50),
                                   style );
     Connect( mwxNotebook->GetId(),   wxEVT_NOTEBOOK_PAGE_CHANGED , 
             (wxObjectEventFunction) 
             (void (wxPanel::*)(wxEvent&))
             &TabWidget::OnTabChange ); 
-    wxFlexGridSizer *sizer     = new wxFlexGridSizer(1);
-    sizer -> Add( mwxNotebook,1,wxGROW | wxALL,10 ); 
-    sizer      -> AddGrowableCol(0);
+    wxBoxSizer *sizer  = new wxBoxSizer(wxHORIZONTAL);
+    sizer -> Add( mwxNotebook,1,wxGROW,0 ); 
     panel      -> SetSizer(sizer);
     panel      -> SetAutoLayout(true);
     panel      -> Layout();
@@ -96,7 +96,6 @@ namespace bbwx
   
   void TabWidget::OnTabChange( wxEvent& )
   {
-   printf("EED TabWidget::OnTabChange %d\n",mwxNotebook->GetSelection() );
        mBox->bbSetOutputSelection( mwxNotebook->GetSelection() );
     mBox->bbSignalOutputModification();
   }
@@ -124,6 +123,7 @@ wxNotebook* TabWidget::GetmwxNotebook()
                bbSetInputWidget7(NULL);
                bbSetInputWidget8(NULL);
                bbSetInputWidget9(NULL);
+        bbSetOutputSelection( 0 );
        }
        
        //-----------------------------------------------------------------     
@@ -230,7 +230,7 @@ void LayoutTab::SetTitleTabs()
     TryInsertWindow(w,"Widget7");
     TryInsertWindow(w,"Widget8");
     TryInsertWindow(w,"Widget9");
-    
+
 //EED2020-04-06
 //    bbSetOutputWidget( w );
     bbSetOutputWidget( tabwidget );