completely disable the style in wxChoice constructor in wxUniv is wrong

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-23 17:42:44 +00:00
parent f7f8dcd7bc
commit e37d2ae438

View File

@@ -63,7 +63,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
int n, const wxString choices[], int n, const wxString choices[],
long WXUNUSED(style), long style,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
@@ -72,7 +72,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
value = choices[0]; value = choices[0];
return wxComboBox::Create(parent, id, value, return wxComboBox::Create(parent, id, value,
pos, size, n, choices, pos, size, n, choices,
wxCB_READONLY, validator, name); wxCB_READONLY | style, validator, name);
} }