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

Fix STL compilation (note: this is not the correct fix, but since

Browse Source 
wxCB_SORT is already ignored for wxUSE_STL == 1 on Mac, let's take
the easy/certainly binary compatible path).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-04-23 22:02:07 +00:00
parent 6c051af454
commit aacd144289
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/choice.cpp
View File

@@ -101,7 +101,13 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
int wxChoice::DoAppend(const wxString& item) int wxChoice::DoAppend(const wxString& item)
{ {
// FIXME: STL version of wxArrayString doesn't have the same args
#if wxUSE_STL
size_t index = m_strings.size();
m_strings.Add( item );
#else
size_t index = m_strings.Add( item ) ; size_t index = m_strings.Add( item ) ;
#endif
m_datas.Insert( NULL , index ) ; m_datas.Insert( NULL , index ) ;
UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() , index ); UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() , index );
DoSetItemClientData( index , NULL ) ; DoSetItemClientData( index , NULL ) ;