added DEP_INFO_FLAGS to compilation options

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index ec6a728102ba92f6d235c28e5a3ae68eca31bad6..30a17488d2f79f62948ac6c3909980dd38e5673c 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -77,7 +77,7 @@ int wxChoice::DoAppend(const wxString& item)
        m_datas.Add( NULL ) ;
        int index = m_strings.GetCount()  - 1  ;
        DoSetItemClientData( index , NULL ) ;
        m_datas.Add( NULL ) ;
        int index = m_strings.GetCount()  - 1  ;
        DoSetItemClientData( index , NULL ) ;

-       SetControlMaximum( m_macControl , Number()) ;
+       SetControlMaximum( m_macControl , GetCount()) ;

        return index ;
 }
 
        return index ;
 }
 


@@ -92,8 +92,8 @@ void wxChoice::Delete(int n)
 
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( 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()
 }
 
 void wxChoice::Clear()


@@ -216,6 +216,13 @@ void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 }
     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)
 {
 /*
 void wxChoice::Command(wxCommandEvent & event)
 {