fixed encoding handling in ANSI mode

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index a88ecc17a1e136758aa963ebe612789ae94567c0..bc008702f43be2c29638fac049fa393aa2e53788 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -176,26 +176,18 @@ wxString wxChoice::GetString(int n) const
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
 
 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" );
                  "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" );
 
                  "invalid index in wxChoice::GetClientData" );
 

-    return (void *)m_datas[N];
+    return (void *)m_datas[n];

 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )