X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..867e99f57d01aaf89e5b470a2db97c95a0ac621f:/src/mac/carbon/choice.cpp

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index f8068ff829..bc008702f4 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -50,10 +50,10 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 	
 		m_macPopUpMenuHandle =  NewUniqueMenu() ;
 		SetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
-	 	SetControlMinimum( (ControlHandle) m_macControl , 0 ) ;
-		SetControlMaximum( (ControlHandle) m_macControl , 0) ;
+	 	SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
+		SetControl32BitMaximum( (ControlHandle) m_macControl , 0) ;
 		if ( n > 0 )
-			SetControlValue( (ControlHandle) m_macControl , 1 ) ;
+			SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ;
 
 		MacPostControlCreate() ;
 
@@ -77,7 +77,7 @@ int wxChoice::DoAppend(const wxString& item)
 	m_datas.Add( NULL ) ;
 	int index = m_strings.GetCount()  - 1  ;
 	DoSetItemClientData( index , NULL ) ;
-	SetControlMaximum( (ControlHandle) m_macControl , GetCount()) ;
+	SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
 	return index ;
 }
 
@@ -93,23 +93,23 @@ void wxChoice::Delete(int n)
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
     m_strings.Remove( n ) ;
     m_datas.RemoveAt( n ) ;
-	SetControlMaximum( (ControlHandle) m_macControl , GetCount()) ;
+	SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
 }
 
 void wxChoice::Clear()
 {
-    Free();
+    FreeData();
 
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
     	::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
-	  }
+    }
     m_strings.Empty() ;
     m_datas.Empty() ;
-	SetControlMaximum( (ControlHandle) m_macControl , 0 ) ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;
 }
 
-void wxChoice::Free()
+void wxChoice::FreeData()
 {
     if ( HasClientObjectData() )
     {
@@ -127,12 +127,12 @@ void wxChoice::Free()
 
 int wxChoice::GetSelection() const
 {
-    return GetControlValue( (ControlHandle) m_macControl ) -1 ;
+    return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
 }
 
 void wxChoice::SetSelection(int n)
 {
-    SetControlValue( (ControlHandle) m_macControl , n + 1 ) ;
+    SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -156,7 +156,7 @@ int wxChoice::FindString(const wxString& s) const
 
 void wxChoice::SetString(int n, const wxString& s)
 {
-    wxFAIL_MSG(wxT("not implemented"));
+    wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
 
 #if 0 // should do this, but no Insert() so far
     Delete(n);
@@ -176,26 +176,18 @@ wxString wxChoice::GetString(int n) const
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
-    wxCHECK_RET( n >= 0 && n < m_datas.GetCount(),
+    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
                  "invalid index in wxChoice::SetClientData" );
-	wxASSERT_MSG( m_datas.GetCount() >= n , "invalid client_data array" ) ;
 	
-	if ( m_datas.GetCount() > n )
-	{
-    	m_datas[n] = (char*) clientData ;
-    }
-    else
-    {
-    	m_datas.Add( (char*) clientData ) ;
-    }
+    m_datas[n] = (char*) clientData ;
 }
 
-void *wxChoice::DoGetItemClientData(int N) const
+void *wxChoice::DoGetItemClientData(int n) const
 {
-    wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL,
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
                  "invalid index in wxChoice::GetClientData" );
 
-    return (void *)m_datas[N];
+    return (void *)m_datas[n];
 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )