correcting DropData behaviour so that preferred format is handled correctly

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 548eee9e53d915b12769cbcb69f876c8afda9acd..852459a9ff2dbe130c28078fc7602fe68557266b 100644 (file)
--- 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() ;
 
@@ -70,7 +68,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;
     verify_noerr ( CreatePopupButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
         -12345 , false /* no variable width */ , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
 
@@ -79,7 +77,14 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     m_peer->SetData<MenuHandle>( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) m_macPopUpMenuHandle ) ;
     m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 ) ;
     MacPostControlCreate(pos,size) ;
-    // TODO wxCB_SORT
+
+#if !wxUSE_STL
+    if ( style & wxCB_SORT )
+    {
+        m_strings = wxArrayString(1) ; // autosort
+    }
+#endif
+    
     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);
@@ -93,10 +98,27 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 // ----------------------------------------------------------------------------
 int wxChoice::DoAppend(const wxString& item)
 {
-    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() );
-    m_strings.Add( item ) ;
-    m_datas.Add( NULL ) ;
-    int index = m_strings.GetCount()  - 1  ;
+#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 ) ;
     m_peer->SetMaximum( GetCount() ) ;
     return index ;
@@ -110,7 +132,7 @@ int wxChoice::DoInsert(const wxString& item, int pos)
     if (pos == GetCount())
         return DoAppend(item);
 
-    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() );
+    UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() , pos );
     m_strings.Insert( item, pos ) ;
     m_datas.Insert( NULL, pos ) ;
     DoSetItemClientData( pos , NULL ) ;
@@ -179,21 +201,14 @@ int wxChoice::GetCount() const
 
 int wxChoice::FindString(const wxString& s) const
 {
-    for( int i = 0 ; i < GetCount() ; i++ )
-    {
-        if ( GetString( i ).IsSameAs(s, false) )
-            return i ;
-    }
-    return wxNOT_FOUND ;
+    return m_strings.Index( s , true , false) ;
 }
 
 void wxChoice::SetString(int n, const wxString& s)
 {
-    wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
-#if 0 // should do this, but no Insert() so far
-    Delete(n);
-    Insert(n + 1, s);
-#endif
+    m_strings[n] = s ;
+    // apple menu pos is 1-based
+    UMASetMenuItemText( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 , s , wxFont::GetDefaultEncoding() ) ;
 }
 
 wxString wxChoice::GetString(int n) const