X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80fdcdb90ef779185492dab676d461fc34933312..7740f1c7c9d0e01c96570841afcc4ee04b2329fd:/src/osx/choice_osx.cpp diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp index bb3427a857..e610b8c86f 100644 --- a/src/osx/choice_osx.cpp +++ b/src/osx/choice_osx.cpp @@ -78,7 +78,7 @@ bool wxChoice::Create(wxWindow *parent, MacPostControlCreate( pos, size ); -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS if ( style & wxCB_SORT ) // autosort m_strings = wxArrayString( 1 ); @@ -109,7 +109,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, { unsigned int idx; -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS if ( IsSorted() ) { wxArrayString::iterator @@ -118,7 +118,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, m_strings.insert( insertPoint, items[i] ); } else -#endif // wxUSE_STL +#endif // wxUSE_STD_CONTAINERS { idx = pos; m_strings.Insert( items[i], idx ); @@ -189,7 +189,7 @@ unsigned int wxChoice::GetCount() const int wxChoice::FindString( const wxString& s, bool bCase ) const { -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS // Avoid assert for non-default args passed to sorted array Index if ( IsSorted() ) bCase = true;