From: Robin Dunn <robin@alldunn.com>
Date: Sat, 7 Jun 2003 15:54:41 +0000 (+0000)
Subject: revert my last change
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3ba18664fc65e3494695bbd57250bcee36625c91

revert my last change


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 4342deb27c..83e91dbfab 100644
--- 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];
 }
 
diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 4342deb27c..83e91dbfab 100644
--- a/src/mac/choice.cpp
+++ b/src/mac/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];
 }