Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxCB_SORT not currently supported on OSX/Cocoa

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-03-06 16:59:39 +00:00
parent 72dc73023f
commit 69f270e0f3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/html/helpwnd.cpp
View File

@@ -417,10 +417,16 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
if ( helpStyle & wxHF_BOOKMARKS ) 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, m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST,
wxEmptyString, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
0, NULL, wxCB_READONLY | wxCB_SORT); 0, NULL, comboStyle);
m_Bookmarks->Append(_("(bookmarks)")); m_Bookmarks->Append(_("(bookmarks)"));
for (unsigned i = 0; i < m_BookmarksNames.GetCount(); i++) for (unsigned i = 0; i < m_BookmarksNames.GetCount(); i++)
m_Bookmarks->Append(m_BookmarksNames[i]); m_Bookmarks->Append(m_BookmarksNames[i]);