diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 18650fc4f8..9f0360a9fc 100644
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -207,7 +207,7 @@ void wxChoice::SetString(unsigned int n, const wxString& rsStr)
     LONG  nIndexType = 0;
     void* pData;
 
-    if ( m_clientDataItemsType != wxClientData_None )
+    if ( HasClientData() )
     {
         pData = DoGetItemClientData(n);
     }