From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 6 Mar 2012 16:59:39 +0000 (+0000)
Subject: wxCB_SORT not currently supported on OSX/Cocoa
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/69f270e0f34e15b3cdf53f6fa697fcedf78fb452?hp=72dc73023f4474d28d83e2cf6878cd310cd9648b

wxCB_SORT not currently supported on OSX/Cocoa


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

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 3518cb3b2d..3bd5c41506 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -417,10 +417,16 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
 
         if ( helpStyle & wxHF_BOOKMARKS )
         {
+            long comboStyle = wxCB_READONLY;
+#ifndef __WXMAC__
+            // Not supported on OSX/Cocoa presently
+            comboStyle |= wxCB_SORT;
+
+#endif
             m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST,
                                          wxEmptyString,
                                          wxDefaultPosition, wxDefaultSize,
-                                         0, NULL, wxCB_READONLY | wxCB_SORT);
+                                         0, NULL, comboStyle);
             m_Bookmarks->Append(_("(bookmarks)"));
             for (unsigned i = 0; i < m_BookmarksNames.GetCount(); i++)
                 m_Bookmarks->Append(m_BookmarksNames[i]);