cleanup - reformat; added (disabled) support for secondary highlight color

[wxWidgets.git] / src / mac / carbon / choice.cpp

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 309bcf0dede3b0d6fa1d33c7a9b988d3e463a8bd..1e36605c7e8361eeb3db3ece5999417b541dfe5d 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.cpp
+// Name:        src/mac/carbon/choice.cpp
 // Purpose:     wxChoice
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "choice.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if wxUSE_CHOICE
@@ -21,9 +17,7 @@
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
 
 extern MenuHandle NewUniqueMenu() ;
 
@@ -80,11 +74,13 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 ) ;
     MacPostControlCreate(pos,size) ;
 
+#if !wxUSE_STL
     if ( style & wxCB_SORT )
     {
         m_strings = wxArrayString(1) ; // autosort
     }
-    
+#endif
+
     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);
@@ -98,7 +94,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 ) ;
@@ -181,9 +195,9 @@ int wxChoice::GetCount() const
     return m_strings.GetCount() ;
 }
 
-int wxChoice::FindString(const wxString& s) const
+int wxChoice::FindString(const wxString& s, bool bCase ) const
 {
-    return m_strings.Index( s , true , false) ;
+    return m_strings.Index( s , bCase ) ;
 }
 
 void wxChoice::SetString(int n, const wxString& s)
@@ -195,7 +209,7 @@ void wxChoice::SetString(int n, const wxString& s)
 
 wxString wxChoice::GetString(int n) const
 {
-    wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), _T(""),
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), wxEmptyString,
                     _T("wxChoice::GetString(): invalid index") );
 
     return m_strings[n] ;