/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/carbon/choice.cpp
+// Name: src/osx/choice_osx.cpp
// Purpose: wxChoice
// Author: Stefan Csomor
// Modified by:
long style,
const wxValidator& validator,
const wxString& name )
-{
- m_macIsUserPane = false;
-
+{
+ DontCreatePeer();
+
if ( !wxChoiceBase::Create( parent, id, pos, size, style, validator, name ) )
return false;
MacPostControlCreate( pos, size );
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
if ( style & wxCB_SORT )
// autosort
m_strings = wxArrayString( 1 );
{
unsigned int idx;
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
if ( IsSorted() )
{
wxArrayString::iterator
m_strings.insert( insertPoint, items[i] );
}
else
-#endif // wxUSE_STL
+#endif // wxUSE_STD_CONTAINERS
{
idx = pos;
m_strings.Insert( items[i], idx );
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;