From: Mattia Barbon <mbarbon@cpan.org>
Date: Sat, 23 Apr 2005 22:02:07 +0000 (+0000)
Subject:   Fix STL compilation (note: this is not the correct fix, but since
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/aacd14428971b5e199f88597f76a895c68dd298f?ds=inline

  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
---

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 5ed7a98e2b..b173ac7d55 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -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 ) ;