#3234 BBTK Feature New Normal InputText with password option

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

diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx
index 8b2ea6479994078fb7d8d89022cd8f34382064ab..3c03e1545a20faa251cc6c9724844497a0f2a212 100644 (file)
--- a/packages/wx/src/bbwxComboBox.cxx
+++ b/packages/wx/src/bbwxComboBox.cxx
@@ -54,7 +54,7 @@ namespace bbwx
                        int sizeY
                )
     :
-    wxPanel( parent, -1,wxDefaultPosition,wxSize(sizeX,sizeY) ) ,
+    wxPanel( parent, -1,wxDefaultPosition ) ,
     mBox(box),
     mTypeForm(typeForm)
   {
@@ -71,8 +71,6 @@ namespace bbwx
     {
           sizer->Add( new wxStaticText(panel,-1,  bbtk::std2wx(title) ) ); 
     }
-    sizer->AddGrowableCol(0);
-    panel->SetSizer(sizer);
     //---------------------------------------------------------------------
        if (mTypeForm==1)
        {
@@ -82,12 +80,16 @@ namespace bbwx
                Connect( wxlistbox->GetId(), 
                  wxEVT_COMMAND_LISTBOX_SELECTED, (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&))&ComboBoxWidget::OnComboBox ); 
        } else if (mTypeForm==0) {
-               wxChoice *wxchoice = new wxChoice ( panel , -1 );
+               wxChoice *wxchoice = new wxChoice ( panel , -1, wxDefaultPosition,wxSize(sizeX,sizeY));
                itemcontainer=wxchoice;
-               sizer->Add( wxchoice,1,wxGROW ); 
+               sizer->Add( wxchoice,1,wxEXPAND ); 
+
                Connect( wxchoice->GetId(), 
                  wxEVT_COMMAND_CHOICE_SELECTED, (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&))&ComboBoxWidget::OnComboBox ); 
        }
+    sizer->AddGrowableCol(0);
+    panel->SetSizer(sizer);
+       
        for (i=0;i<lstIn.size(); i++)
        {
                itemcontainer->Append(  bbtk::std2wx( lstIn[i] )  );