From 53ab8e0d5fe76d49c576f87dd5254a799ee3da73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 6 Feb 2007 12:26:33 +0000 Subject: [PATCH] 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/branches/WX_2_8_BRANCH@44380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 4 ++++ src/univ/combobox.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index d066ff94c4..bfc9e7027a 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -114,6 +114,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 89130b4e3c..febde2efc1 100644 --- 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