X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6519b40fe9f5e4706e02497fe01ff71c65079d6..49a63afbad7646668df343d29edd88458bc7e0a9:/include/wx/gtk1/textctrl.h?ds=sidebyside diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index 8c8f3dec07..c594bc46b2 100644 --- a/include/wx/gtk1/textctrl.h +++ b/include/wx/gtk1/textctrl.h @@ -42,11 +42,6 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual wxString GetValue() const; - virtual void SetValue(const wxString& value) { DoSetValue(value, SetValue_SendEvent); } - - virtual void ChangeValue(const wxString &value) { DoSetValue(value); } - virtual int GetLineLength(long lineNo) const; virtual wxString GetLineText(long lineNo) const; virtual int GetNumberOfLines() const; @@ -109,7 +104,7 @@ public: virtual void SetSelection(long from, long to); virtual void SetEditable(bool editable); - virtual bool Enable( bool enable = true ); + virtual void DoEnable( bool enable ); // Implementation from now on void OnDropFiles( wxDropFilesEvent &event ); @@ -142,11 +137,6 @@ public: void SetModified() { m_modified = true; } - // GTK+ textctrl is so dumb that you need to freeze/thaw it manually to - // avoid horrible flicker/scrolling back and forth - virtual void Freeze(); - virtual void Thaw(); - // textctrl specific scrolling virtual bool ScrollLines(int lines); virtual bool ScrollPages(int pages); @@ -156,7 +146,7 @@ public: // wxGTK-specific: called recursively by Enable, // to give widgets an oppprtunity to correct their colours after they // have been changed by Enable - virtual void OnParentEnable( bool enable ) ; + virtual void OnEnabled( bool enabled ) ; // tell the control to ignore next text changed signal void IgnoreNextTextUpdate(); @@ -173,6 +163,10 @@ protected: // common part of all ctors void Init(); + // overridden wxWindow methods + virtual void DoFreeze(); + virtual void DoThaw(); + // get the vertical adjustment, if any, NULL otherwise GtkAdjustment *GetVAdj() const; @@ -184,7 +178,8 @@ protected: // override this and return true. virtual bool UseGTKStyleBase() const { return true; } - void DoSetValue(const wxString &value, int flags = 0); + virtual void DoSetValue(const wxString &value, int flags = 0); + virtual wxString DoGetValue() const; private: // change the font for everything in this control