X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b3dc8019a520ce5e166c8ae9098ba020f8b3f94..f98bd6d6cf33f0475b5d737a2968b42b7ea0009f:/src/mac/carbon/choice.cpp?ds=sidebyside

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index d4268c6e97..f2173eb03c 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -217,6 +217,12 @@ unsigned int wxChoice::GetCount() const
 
 int wxChoice::FindString( const wxString& s, bool bCase ) const
 {
+#if !wxUSE_STL
+    // Avoid assert for non-default args passed to sorted array Index
+    if ( HasFlag(wxCB_SORT) )
+        bCase = true;
+#endif
+
     return m_strings.Index( s , bCase ) ;
 }