Fixed wxComboBox always sorted in all univ builds (see wxforum.shadonet.com/viewtopic.php?p=53661)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2007-02-06 12:12:10 +00:00
parent 162f6b2aee
commit 750040fabb
2 changed files with 6 additions and 2 deletions

View File

@ -62,6 +62,10 @@ wxX11:
- Don't crash in wxWindow dtor if the window hadn't been really Create()d - Don't crash in wxWindow dtor if the window hadn't been really Create()d
wxUniv:
- Fixed wxComboBox always sorted
2.8.1 2.8.1
----- -----

View File

@ -122,8 +122,8 @@ bool wxComboListBox::Create(wxWindow* parent)
if ( !wxListBox::Create(parent, wxID_ANY, if ( !wxListBox::Create(parent, wxID_ANY,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
0, NULL, 0, NULL,
wxBORDER_SIMPLE | wxLB_INT_HEIGHT | wxBORDER_SIMPLE |
m_combo->GetWindowStyle() & wxCB_SORT ? wxLB_SORT : 0) ) ( m_combo->GetWindowStyle() & wxCB_SORT ? wxLB_SORT : 0 ) ) )
return false; return false;
// we don't react to the mouse events outside the window at all // we don't react to the mouse events outside the window at all