X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b6986c39214ba04270773fc8f3f6838a7c16f9a..8cc3b2e9821e9d20071d3f70cec17439554696ee:/src/mac/carbon/choice.cpp?ds=sidebyside

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 5ed7a98e2b..852459a9ff 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -21,9 +21,7 @@
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
 
 extern MenuHandle NewUniqueMenu() ;
 
@@ -80,7 +78,6 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     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 )
     {
@@ -101,7 +98,25 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 // ----------------------------------------------------------------------------
 int wxChoice::DoAppend(const wxString& item)
 {
+#if wxUSE_STL
+    wxArrayString::iterator insertPoint;
+    size_t index;
+    
+    if (GetWindowStyle() & wxCB_SORT)
+    {
+        insertPoint = std::lower_bound( m_strings.begin(), m_strings.end(), item );
+        index = insertPoint - m_strings.begin();
+    }
+    else
+    {
+        insertPoint = m_strings.end();
+        index = m_strings.size();
+    }
+
+    m_strings.insert( insertPoint, 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 ) ;