adjusting to changed ownership (font is only created in the GetFont call of wxTextAttr)

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index e91486c6d7038413cfab7e39f9f73b2d95fb7303..9f0360a9fcbb2a59d24436fd34d300effd6ff461 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)

 
 bool wxChoice::Create(
   wxWindow*                         pParent
 
 bool wxChoice::Create(
   wxWindow*                         pParent


@@ -207,7 +207,7 @@ void wxChoice::SetString(unsigned int n, const wxString& rsStr)
     LONG  nIndexType = 0;
     void* pData;
 
     LONG  nIndexType = 0;
     void* pData;
 

-    if ( m_clientDataItemsType != wxClientData_None )
+    if ( HasClientData() )

     {
         pData = DoGetItemClientData(n);
     }
     {
         pData = DoGetItemClientData(n);
     }