Fix STL compilation (note: this is not the correct fix, but since
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:
@@ -101,7 +101,13 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||
// ----------------------------------------------------------------------------
|
||||
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 ) ;
|
||||
#endif
|
||||
m_datas.Insert( NULL , index ) ;
|
||||
UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() , index );
|
||||
DoSetItemClientData( index , NULL ) ;
|
||||
|
Reference in New Issue
Block a user