X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e793ec144962e443c6fa51ffb628136eab8263ab..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/textentry.h diff --git a/include/wx/textentry.h b/include/wx/textentry.h index 3a240d1a1a..3fadbd0322 100644 --- a/include/wx/textentry.h +++ b/include/wx/textentry.h @@ -38,8 +38,7 @@ public: // SetValue() generates a text change event, ChangeValue() doesn't virtual void SetValue(const wxString& value) { DoSetValue(value, SetValue_SendEvent); } - virtual void ChangeValue(const wxString& value) - { DoSetValue(value, SetValue_NoEvent); } + virtual void ChangeValue(const wxString& value); // writing text inserts it at the current position replacing any current // selection, appending always inserts it at the end and doesn't remove any @@ -175,6 +174,14 @@ public: } + // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window if the + // events are not currently disabled + void SendTextUpdatedEventIfAllowed() + { + if ( EventsAllowed() ) + SendTextUpdatedEvent(); + } + // this function is provided solely for the purpose of forwarding text // change notifications state from one control to another, e.g. it can be // used by a wxComboBox which derives from wxTextEntry if it delegates all @@ -239,15 +246,6 @@ protected: friend class EventsSuppressor; - // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window if the - // events are not currently disabled - void SendTextUpdatedEventIfAllowed() - { - if ( EventsAllowed() ) - SendTextUpdatedEvent(); - } - - private: // suppress or resume the text changed events generation: don't use these // functions directly, use EventsSuppressor class above instead @@ -280,6 +278,10 @@ private: // hint-related stuff, only allocated if/when SetHint() is used wxTextEntryHintData *m_hintData; + + // It needs to call our Do{Get,Set}Value() to work with the real control + // contents. + friend class wxTextEntryHintData; }; #ifdef __WXUNIVERSAL__