X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/univ/textctrl.cpp diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 1c2fa3c814..25a44a78eb 100644 --- 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);