Workaround for wxUSE_STL

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 309bcf0dede3b0d6fa1d33c7a9b988d3e463a8bd..5ed7a98e2b91bc7eaa590fee038181d74900b42b 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -80,10 +80,13 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 ) ;
     MacPostControlCreate(pos,size) ;
 
     m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 ) ;
     MacPostControlCreate(pos,size) ;
 

+    // FIXME: STL version of wxArrayString doesn't have the same args
+#if !wxUSE_STL

     if ( style & wxCB_SORT )
     {
         m_strings = wxArrayString(1) ; // autosort
     }
     if ( style & wxCB_SORT )
     {
         m_strings = wxArrayString(1) ; // autosort
     }

+#endif

     
     for ( int i = 0; i < n; i++ )
     {
     
     for ( int i = 0; i < n; i++ )
     {