Move wx/msw/gccpriv.h inclusion back to wx/platform.h from wx/compiler.h.

[wxWidgets.git] / src / univ / textctrl.cpp

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 1c2fa3c8142f7a16103fac26967f77b5f3e9008c..25a44a78eb40f40d54edc43c24610a36d1887c27 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -633,8 +633,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_SIZE(wxTextCtrl::OnSize)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
@@ -1264,8 +1262,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
     // now call it to do the rest (not related to refreshing)
     ClearSelection();
 
-    if ( EventsAllowed() )
-        SendTextUpdatedEvent();
+    SendTextUpdatedEventIfAllowed();
 }
 
 void wxTextCtrl::Remove(wxTextPos from, wxTextPos to)
@@ -4712,7 +4709,7 @@ bool wxTextCtrl::PerformAction(const wxControlAction& actionOrig,
     {
         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);
 
@@ -4736,7 +4733,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& 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);