X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58045daa7ca94e20095ab7729b3f465bf1661a13..85d64f6aa1d657b9463cb0cefedc5dbbf1facfac:/src/motif/combobox_native.cpp

diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp
index 91f7f3d16c..16630bf747 100644
--- a/src/motif/combobox_native.cpp
+++ b/src/motif/combobox_native.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Ian Brown
 // Modified by:
 // Created:     01/02/03
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,8 +66,6 @@ static Widget GetXmText( const wxComboBox* cb )
 void  wxComboBoxCallback (Widget w, XtPointer clientData,
                           XmComboBoxCallbackStruct * cbs);
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,
@@ -296,7 +293,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
     case XmCR_BROWSE_SELECT:
 #endif
         {
-            wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
+            wxCommandEvent event (wxEVT_COMBOBOX,
                                   item->GetId());
             int idx = cbs->item_position;
             event.SetInt(idx);
@@ -312,7 +309,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         }
     case XmCR_VALUE_CHANGED:
         {
-            wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
+            wxCommandEvent event (wxEVT_TEXT, item->GetId());
             event.SetInt(-1);
             event.SetString( item->GetValue() );
             event.SetExtraLong(true);
@@ -327,7 +324,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
 
 void wxComboBox::ChangeFont(bool keepOriginalSize)
 {
-    if( m_font.Ok() && m_mainWidget != NULL )
+    if( m_font.IsOk() && m_mainWidget != NULL )
     {
         wxDoChangeFont( GetXmText(this), m_font );
         wxDoChangeFont( GetXmList(this), m_font );