applied Otto Wyss' patch to extend wxHelpController::KeywordSearch with mode argument...

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 9f7d40175e83a519ead7641165f6dcc61e9ab4d6..c130d3798aa099eb4a68f8d16755fe6194fcd73b 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -46,13 +46,16 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
+    if ( !wxChoiceBase::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+
     Rect bounds ;
     Str255 title ;
-    
+
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 , 
-        kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
-    
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 ,
+        kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ;
+
     m_macPopUpMenuHandle =  NewUniqueMenu() ;
     SetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
     SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
@@ -60,6 +63,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     if ( n > 0 )
         SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ;
     MacPostControlCreate() ;
+    // TODO wxCB_SORT
     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);
@@ -105,7 +109,7 @@ void wxChoice::Delete(int n)
         delete GetClientObject(n);
     }
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
-    m_strings.Remove( n ) ;
+    m_strings.RemoveAt( n ) ;
     m_datas.RemoveAt( n ) ;
     SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
 }
@@ -161,7 +165,7 @@ int wxChoice::FindString(const wxString& s) const
     for( int i = 0 ; i < GetCount() ; i++ )
     {
         if ( GetString( i ).IsSameAs(s, FALSE) )
-            return i ; 
+            return i ;
     }
     return wxNOT_FOUND ;
 }
@@ -177,8 +181,12 @@ 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(""),
+                    _T("wxChoice::GetString(): invalid index") );
+
     return m_strings[n] ;
 }
+
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
@@ -186,7 +194,7 @@ void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
     wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
                  wxT("invalid index in wxChoice::SetClientData") );
-    
+
     m_datas[n] = (char*) clientData ;
 }
 
@@ -207,7 +215,7 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const
     return (wxClientData *)DoGetItemClientData(n);
 }
 
-void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) 
 {
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
     int n = GetSelection();
@@ -232,11 +240,11 @@ wxSize wxChoice::DoGetBestSize() const
     int wLine;
 #if TARGET_CARBON
     long metric ;
-    GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );   
-    lbHeight = metric ; 
+    GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );
+    lbHeight = metric ;
 #endif
     {
-        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
         wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
         if ( font )
         {
@@ -274,7 +282,7 @@ wxSize wxChoice::DoGetBestSize() const
         // And just a bit more
         int cx = ::TextWidth( "X" , 0 , 1 ) ;
         lbWidth += cx ;
-        
+
     }
     return wxSize(lbWidth, lbHeight);
 }