first attempt at adding the minimal set needed for dead-key support, see #15345

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 18650fc4f86de3f991a228a9f9461cc241c51d87..ab7747cea2e7b57825c41316e0e0b3d9aa1883d4 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,8 +23,6 @@
 
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 bool wxChoice::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
@@ -207,7 +204,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);
     }
@@ -366,7 +363,7 @@ bool wxChoice::OS2Command(
 
     if (n > -1)
     {
-        wxCommandEvent              vEvent( wxEVT_COMMAND_CHOICE_SELECTED
+        wxCommandEvent              vEvent( wxEVT_CHOICE
                                            ,m_windowId
                                           );