fixed client area handling for wxFrame/Univ

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 73dfa522d3df73fd958705feb647509e7e891c04..30a17488d2f79f62948ac6c3909980dd38e5673c 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -13,7 +13,8 @@
 #pragma implementation "choice.h"
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
+#include "wx/defs.h"
+
 #include "wx/choice.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
@@ -76,7 +77,7 @@ int wxChoice::DoAppend(const wxString& item)
        m_datas.Add( NULL ) ;
        int index = m_strings.GetCount()  - 1  ;
        DoSetItemClientData( index , NULL ) ;
-       SetControlMaximum( m_macControl , Number()) ;
+       SetControlMaximum( m_macControl , GetCount()) ;
        return index ;
 }
 
@@ -91,8 +92,8 @@ void wxChoice::Delete(int n)
 
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;
-    m_datas.Remove( n ) ;
-       SetControlMaximum( m_macControl , Number()) ;
+    m_datas.RemoveAt( n ) ;
+       SetControlMaximum( m_macControl , GetCount()) ;
 }
 
 void wxChoice::Clear()
@@ -215,6 +216,13 @@ void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 }
+
+wxSize wxChoice::DoGetBestSize() const
+{
+    // TODO should modify this to take into account string length ala wxGTK
+    return wxSize(100,20);
+}
+
 /*
 void wxChoice::Command(wxCommandEvent & event)
 {