X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..cc4d5638c66a409e421420ed7110917755a66788:/src/univ/textctrl.cpp?ds=sidebyside diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 1c2fa3c814..b0efa231f6 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 15.09.00 -// RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -633,8 +632,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_SIZE(wxTextCtrl::OnSize) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) - // ---------------------------------------------------------------------------- // creation // ---------------------------------------------------------------------------- @@ -1264,8 +1261,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 +4708,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 +4732,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);