X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cd7bc23d574ea5ec62f1abea73eb363a9ea8126..204abcd474fa99071b7bb5b00f7e212b0bde16dc:/src/mac/carbon/choice.cpp?ds=sidebyside

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 8898554b20..e5f7c54da4 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -17,13 +17,14 @@
 
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
+    #include "wx/dcclient.h"
 #endif
 
 #include "wx/mac/uma.h"
 
 extern MenuHandle NewUniqueMenu() ;
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
 
 
 wxChoice::~wxChoice()
@@ -49,11 +50,14 @@ bool wxChoice::Create(wxWindow *parent,
     const wxValidator& validator,
     const wxString& name )
 {
-    wxCArrayString chs( choices );
-
     return Create(
-        parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+        parent, id, pos, size, 0, NULL,
         style, validator, name );
+
+    Append( choices );
+
+    if ( !choices.empty() )
+        SetSelection( 0 );
 }
 
 bool wxChoice::Create(wxWindow *parent,
@@ -90,17 +94,14 @@ bool wxChoice::Create(wxWindow *parent,
         m_strings = wxArrayString( 1 );
 #endif
 
-    for ( int i = 0; i < n; i++ )
-    {
-        Append( choices[i] );
-    }
+    Append(n, choices);
 
     // Set the first item as being selected
     if (n > 0)
         SetSelection( 0 );
 
     // Needed because it is a wxControlWithItems
-    SetBestSize( size );
+    SetInitialSize( size );
 
     return true;
 }
@@ -108,54 +109,45 @@ bool wxChoice::Create(wxWindow *parent,
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
-int wxChoice::DoAppend( const wxString& item )
-{
-#if wxUSE_STL
-    wxArrayString::iterator insertPoint;
-    unsigned int index;
 
-    if (GetWindowStyle() & wxCB_SORT)
-    {
-        insertPoint = std::lower_bound( m_strings.begin(), m_strings.end(), item );
-        index = insertPoint - m_strings.begin();
-    }
-    else
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)
+{
+    const unsigned int numItems = items.GetCount();
+    for( unsigned int i = 0; i < numItems; ++i, ++pos )
     {
-        insertPoint = m_strings.end();
-        index = m_strings.size();
-    }
-
-    m_strings.insert( insertPoint, item );
-#else
-    unsigned int index = m_strings.Add( item );
-#endif
+        unsigned int idx;
 
-    m_datas.Insert( NULL , index );
-    UMAInsertMenuItem( MAC_WXHMENU( m_macPopUpMenuHandle ), item, m_font.GetEncoding(), index );
-    DoSetItemClientData( index, NULL );
-    m_peer->SetMaximum( GetCount() );
-
-    return index;
-}
-
-int wxChoice::DoInsert( const wxString& item, unsigned int pos )
-{
-    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1, wxT("wxChoice::DoInsert: can't insert into sorted list") );
-    wxCHECK_MSG( IsValidInsert(pos), -1, wxT("wxChoice::DoInsert: invalid index") );
+#if wxUSE_STL
+        if ( IsSorted() )
+        {
+            wxArrayString::iterator
+                insertPoint = std::lower_bound( m_strings.begin(), m_strings.end(), items[i] );
+            idx = insertPoint - m_strings.begin();
+            m_strings.insert( insertPoint, items[i] );
+        }
+        else
+#endif // wxUSE_STL
+        {
+            idx = pos;
+            m_strings.Insert( items[i], idx );
+        }
 
-    if (pos == GetCount())
-        return DoAppend( item );
+        UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ),
+                          items[i],
+                          m_font.GetEncoding(),
+                          idx);
+        m_datas.Insert( NULL, idx );
+        AssignNewItemClientData(idx, clientData, i, type);
+    }
 
-    UMAInsertMenuItem( MAC_WXHMENU( m_macPopUpMenuHandle ), item, m_font.GetEncoding(), pos );
-    m_strings.Insert( item, pos );
-    m_datas.Insert( NULL, pos );
-    DoSetItemClientData( pos, NULL );
     m_peer->SetMaximum( GetCount() );
 
-    return pos;
+    return pos - 1;
 }
 
-void wxChoice::Delete(unsigned int n)
+void wxChoice::DoDeleteOneItem(unsigned int n)
 {
     wxCHECK_RET( IsValid(n) , wxT("wxChoice::Delete: invalid index") );
 
@@ -168,9 +160,8 @@ void wxChoice::Delete(unsigned int n)
     m_peer->SetMaximum( GetCount() ) ;
 }
 
-void wxChoice::Clear()
+void wxChoice::DoClear()
 {
-    FreeData();
     for ( unsigned int i = 0 ; i < GetCount() ; i++ )
     {
         ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
@@ -181,18 +172,6 @@ void wxChoice::Clear()
     m_peer->SetMaximum( 0 ) ;
 }
 
-void wxChoice::FreeData()
-{
-    if ( HasClientObjectData() )
-    {
-        unsigned int count = GetCount();
-        for ( unsigned int n = 0; n < count; n++ )
-        {
-            delete GetClientObject( n );
-        }
-    }
-}
-
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
@@ -219,7 +198,7 @@ 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) )
+    if ( IsSorted() )
         bCase = true;
 #endif
 
@@ -260,16 +239,6 @@ void * wxChoice::DoGetItemClientData(unsigned int n) const
     return (void *)m_datas[n];
 }
 
-void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
-    DoSetItemClientData(n, clientData);
-}
-
-wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
-{
-    return (wxClientData*)DoGetItemClientData( n ) ;
-}
-
 wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
 {
     wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
@@ -299,69 +268,34 @@ wxSize wxChoice::DoGetBestSize() const
     int lbHeight = 20;
     int wLine;
 
-#if TARGET_CARBON
     SInt32 metric ;
 
     GetThemeMetric( kThemeMetricPopupButtonHeight , &metric );
     lbHeight = metric ;
-#endif
 
     {
-#if wxMAC_USE_CORE_GRAPHICS
         wxClientDC dc(const_cast<wxChoice*>(this));
-#else
-        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
-        if ( m_font.Ok() )
-        {
-            ::TextFont( m_font.MacGetFontNum() ) ;
-            ::TextSize( m_font.MacGetFontSize() ) ;
-            ::TextFace( m_font.MacGetFontStyle() ) ;
-        }
-        else
-        {
-            ::TextFont( kFontIDMonaco ) ;
-            ::TextSize( 9 ) ;
-            ::TextFace( 0 ) ;
-        }
-#endif
+
         // Find the widest line
         for(unsigned int i = 0; i < GetCount(); i++)
         {
             wxString str(GetString(i));
-#if wxMAC_USE_CORE_GRAPHICS
+
             wxCoord width, height ;
             dc.GetTextExtent( str , &width, &height);
             wLine = width ;
-#else
-#if wxUSE_UNICODE
-            Point bounds = { 0, 0 } ;
-            SInt16 baseline ;
-
-            ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,
-                kThemeCurrentPortFont,
-                kThemeStateActive,
-                false,
-                &bounds,
-                &baseline );
-
-            wLine = bounds.h ;
-#else
-            wLine = ::TextWidth( str.c_str() , 0 , str.length() ) ;
-#endif
-#endif
+
             lbWidth = wxMax( lbWidth, wLine ) ;
         }
 
         // Add room for the popup arrow
         lbWidth += 2 * lbHeight ;
-#if wxMAC_USE_CORE_GRAPHICS
+
         wxCoord width, height ;
         dc.GetTextExtent( wxT("X"), &width, &height);
         int cx = width ;
-#else
-        // And just a bit more
-        int cx = ::TextWidth( "X" , 0 , 1 ) ;
-#endif
+        lbHeight += 4;
+
         lbWidth += cx ;
     }