Fixed wxComboBox always sorted in all univ builds (see wxforum.shadonet.com/viewtopic...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index ff0c93d7337ecd096df2dc6899f6b1650a93c4c8..62d85bec8a991244824dc30e87cf8bb3502dc415 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -62,6 +62,10 @@ wxX11:
 
 - Don't crash in wxWindow dtor if the window hadn't been really Create()d
 
+wxUniv:
+
+- Fixed wxComboBox always sorted
+
 
 2.8.1
 -----

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 89130b4e3cc35fd1360f6d8758c712c4a53c70c9..febde2efc112c6b7910e102e55b076c8dc85947e 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -122,8 +122,8 @@ bool wxComboListBox::Create(wxWindow* parent)
     if ( !wxListBox::Create(parent, wxID_ANY,
                             wxDefaultPosition, wxDefaultSize,
                             0, NULL,
-                            wxBORDER_SIMPLE | wxLB_INT_HEIGHT |
-                            m_combo->GetWindowStyle() & wxCB_SORT ? wxLB_SORT : 0) )
+                            wxBORDER_SIMPLE |
+                            ( m_combo->GetWindowStyle() & wxCB_SORT ? wxLB_SORT : 0 ) ) )
         return false;
 
     // we don't react to the mouse events outside the window at all