missing commit

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 8900b0ef18b774e08c82a1b04de25a8f6eea9fb4..2e3d4f6371dcf84aada86ada6b489385ce381b1f 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -35,8 +35,6 @@ MRESULT EXPENTRY wxComboEditWndProc( HWND   hWnd
 //
 static WXFARPROC gfnWndprocEdit     = (WXFARPROC)NULL;
 
 //
 static WXFARPROC gfnWndprocEdit     = (WXFARPROC)NULL;
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-

 bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
 {
     long lSel = GetSelection();
 bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
 {
     long lSel = GetSelection();


@@ -47,7 +45,7 @@ bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
         case CBN_LBSELECT:
             if (lSel > -1)
             {
         case CBN_LBSELECT:
             if (lSel > -1)
             {

-                wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
+                wxCommandEvent vEvent( wxEVT_COMBOBOX, GetId() );

 
                 vEvent.SetInt(lSel);
                 vEvent.SetEventObject(this);
 
                 vEvent.SetInt(lSel);
                 vEvent.SetEventObject(this);


@@ -59,7 +57,7 @@ bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
 
         case CBN_EFCHANGE:
             {
 
         case CBN_EFCHANGE:
             {

-                wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() );
+                wxCommandEvent vEvent( wxEVT_TEXT, GetId() );

 
                 if (lSel == -1L)
                     sValue = GetValue();
 
                 if (lSel == -1L)
                     sValue = GetValue();


@@ -140,7 +138,7 @@ bool wxComboBox::Create(
         lSstyle |= CBS_DROPDOWN;
 
 
         lSstyle |= CBS_DROPDOWN;
 
 

-    if (!OS2CreateControl( _T("COMBOBOX")
+    if (!OS2CreateControl( wxT("COMBOBOX")

                           ,lSstyle
                          ))
         return false;
                           ,lSstyle
                          ))
         return false;