#3476 DateTime box std

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

diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx
index 086708b92fa2fa554b0f160fc006ff2418a16960..fe33889c4566fd674672e0e2d6522f308b550337 100644 (file)
--- a/packages/wx/src/bbwxComboBox.cxx
+++ b/packages/wx/src/bbwxComboBox.cxx
@@ -72,10 +72,15 @@ namespace bbwx
     // 2) Insertion of the components in the window
     
     // We use a FlexGridSizer
+//    wxFlexGridSizer *sizerV          = new wxFlexGridSizer(1);
+//    wxFlexGridSizer *sizerH1 = new wxFlexGridSizer(0);
+//    wxFlexGridSizer *sizerH2 = new wxFlexGridSizer(2);
     wxFlexGridSizer *sizer     = new wxFlexGridSizer(2);
+       
     if (title!="")
     {
           sizer->Add( new wxStaticText(panel,-1,  bbtk::std2wx(title) ) ); 
+          sizer->Add( new wxStaticText(panel,-1,  _T("") ) ); 
     }
     //---------------------------------------------------------------------
        if (mTypeForm==1)
@@ -101,19 +106,12 @@ namespace bbwx
                         (wxObjectEventFunction) 
                         (void (wxPanel::*)(wxScrollEvent&))
                         &ComboBoxWidget::OnSpinCtrlClick);
-  
                sizer->Add( mwxspinbutton,1,wxEXPAND ); 
        }
-
     sizer->AddGrowableCol(0);
+
     panel->SetSizer(sizer);
-       FillItems( iSelection,lstIn );
-       
-//     for (i=0;i<lstIn.size(); i++)
-//     {
-//             itemcontainer->Append(  bbtk::std2wx( lstIn[i] )  ); 
-//     } // for i
-//     itemcontainer->SetSelection(iSelection);
+       FillItems( iSelection,lstIn );  
   }
 
   //-------------------------------------------------------------------------  
@@ -177,30 +175,15 @@ void ComboBoxWidget::OnComboBox(wxEvent& event)
 void ComboBoxWidget::OnSpinCtrlClick(wxCommandEvent& event)
 {
        int iSelection = mwxspinbutton->GetValue();
-       printf("EED ComboBoxWidget::OnSpinCtrlClick %d\n", iSelection );
        itemcontainer->SetSelection(iSelection);
        OnComboBoxSelection( iSelection );
-
-/*
-       if (mBox->bbGetInputType()==0)
-       {
-         mBox->bbSetOutputOut( mwxSpinCtrl->GetValue() );
-       } else {
-         mBox->bbSetOutputOut( mwxSpinButton->GetValue() );
-       }// if Type
-
-         // and signal that the output has changed
-         //if(_reactiveOnKeyStroke==1){
-         mBox->bbSignalOutputModification(std::string("Out"));
-         //}
-*/       
 }
 
 
 //--------------------------------------------------------------------------
 void ComboBoxWidget::FillItems( int iSelection, std::vector< std::string > lstIn )
 {
-       int i,size=lstIn.size();
+       int i,size = lstIn.size();
 
 
 #if defined(_WIN32)
@@ -257,15 +240,15 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ComboBox,bbtk::WxBlackBox);
 void ComboBox::Process()
 {
        int iSelection = bbGetInputSelection();
-       if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=bbGetInputIn().size()-1; }
-//     if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=0; }
+//     if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=bbGetInputIn().size()-1; }
+       if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=0; }
        ComboBoxWidget *w = (ComboBoxWidget*)bbGetOutputWidget();
        w->FillItems( iSelection, bbGetInputIn() );
     bbSetInputSelection( iSelection );
     bbSetOutputOut( iSelection );
     int size = bbGetInputIn().size();
     if         (  (iSelection>=0) && ( iSelection<size) ) 
-    { 
+    {
        bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
     } // if iSelection
        w->VerifyDeselect(iSelection);