EVT_SIZE(wxTextCtrl::OnSize)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
     // now call it to do the rest (not related to refreshing)
     ClearSelection();
 
-    if ( EventsAllowed() )
-        SendTextUpdatedEvent();
+    SendTextUpdatedEventIfAllowed();
 }
 
 void wxTextCtrl::Remove(wxTextPos from, wxTextPos to)
     {
         wxASSERT_MSG( IsEditable(), wxT("non editable control changed?") );
 
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+        wxCommandEvent event(wxEVT_TEXT, GetId());
         InitCommandEvent(event);
         GetEventHandler()->ProcessEvent(event);
 
         {
             if ( IsSingleLine() || (GetWindowStyle() & wxTE_PROCESS_ENTER) )
             {
-                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, GetId());
+                wxCommandEvent event(wxEVT_TEXT_ENTER, GetId());
                 InitCommandEvent(event);
                 event.SetString(GetValue());
                 GetEventHandler()->ProcessEvent(event);