From: Eduardo DAVILA Date: Wed, 13 Mar 2019 13:17:40 +0000 (+0100) Subject: #3235 BBTK Bug New Normal - size wxcombo box X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c90249b3bf6eaa6e455e0a6390ea5897108d572c;hp=714c8039f8498b724c1a22cfcfed3586a22d6235;p=bbtk.git #3235 BBTK Bug New Normal - size wxcombo box --- diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx index 3c03e15..29d3782 100644 --- a/packages/wx/src/bbwxComboBox.cxx +++ b/packages/wx/src/bbwxComboBox.cxx @@ -82,7 +82,7 @@ namespace bbwx } else if (mTypeForm==0) { wxChoice *wxchoice = new wxChoice ( panel , -1, wxDefaultPosition,wxSize(sizeX,sizeY)); itemcontainer=wxchoice; - sizer->Add( wxchoice,1,wxEXPAND ); + sizer->Add( wxchoice,1,wxGROW ); Connect( wxchoice->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&))&ComboBoxWidget::OnComboBox ); @@ -126,6 +126,13 @@ namespace bbwx VerifyDeselect(iSelection); + if (mTypeForm==0) + { + wxChoice *wxchoise=(wxChoice *)itemcontainer; + wxchoise->SetToolTip( itemcontainer->GetString(iSelection) ); + } // if mTypeForm + + // mBox->bbSignalOutputModification("Out"); // mBox->bbSignalOutputModification("OutString"); } // if iSelection @@ -194,8 +201,8 @@ void ComboBox::bbUserSetDefaultValues() bbSetInputSelection(0); bbSetInputTitle(""); bbSetInputForm(0); - bbSetInputWinWidth(100); - bbSetInputWinHeight(200); + bbSetInputWinWidth(10); + bbSetInputWinHeight(45); bbSetInputDeselect(false); } //=====