cast correction Profiler

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 4342deb27cc10100d2e9a40fb69360a21718f1ec..86d75eb0da14405232ad9e54bc81eb293ff67f50 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -192,9 +192,8 @@ void wxChoice::DoSetItemClientData( int n, void* clientData )
 
 void *wxChoice::DoGetItemClientData(int n) const
 {
-    if ( n < 0 || (size_t)n >= m_datas.GetCount() )
-        return (void*)NULL;
-
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
+                 wxT("invalid index in wxChoice::GetClientData") );
     return (void *)m_datas[n];
 }
 
@@ -208,7 +207,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();