// event tables and other macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
         case WXK_RETURN:
             if ( !(m_windowStyle & wxTE_MULTILINE) )
             {
-                wxCommandEvent      vEvent(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                wxCommandEvent      vEvent(wxEVT_TEXT_ENTER, m_windowId);
 
                 vEvent.SetEventObject(this);
                 if ( HandleWindowEvent(vEvent))
                     break;
                 }
 
-                wxCommandEvent      vEvent( wxEVT_COMMAND_TEXT_UPDATED
+                wxCommandEvent      vEvent( wxEVT_TEXT
                                            ,m_windowId
                                           );