X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxComboBox.cxx;h=3c03e1545a20faa251cc6c9724844497a0f2a212;hb=3f088371dd1b2558e08da80141f2c0d6da0f1413;hp=8b2ea6479994078fb7d8d89022cd8f34382064ab;hpb=19c9e9989a6be039aac2daac660e9133ee578ed7;p=bbtk.git diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx index 8b2ea64..3c03e15 100644 --- 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;iAppend( bbtk::std2wx( lstIn[i] ) );