From: Eduardo DAVILA Date: Fri, 10 Aug 2018 09:48:14 +0000 (+0200) Subject: #3212 BBTK Feature New Normal - vtk8itk4wx3-mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=dc704ef6c582d0ba65c331bb20bf27dcf4d2bf04;p=bbtk.git #3212 BBTK Feature New Normal - vtk8itk4wx3-mingw64 --- diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx index 8b2ea64..d0872dd 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); itemcontainer=wxchoice; sizer->Add( wxchoice,1,wxGROW ); + 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] ) );