guard against nullptr

[wxWidgets.git] / src / os2 / choice.cpp

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 18650fc4f86de3f991a228a9f9461cc241c51d87..1804a62b240116a1f0dc4d9c4208dde018e453b4 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -24,8 +24,6 @@
 
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 bool wxChoice::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
@@ -207,7 +205,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);
     }