X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/x11/textctrl.h?ds=sidebyside diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h index 197acb64b5..b076e0ec72 100644 --- a/include/wx/x11/textctrl.h +++ b/include/wx/x11/textctrl.h @@ -21,13 +21,12 @@ #include "wx/scrolwin.h" #include "wx/arrstr.h" -#include "wx/datetime.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; //----------------------------------------------------------------------------- // helpers @@ -116,8 +115,7 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual wxString GetValue() const; - virtual void SetValue(const wxString& value); + virtual void ChangeValue(const wxString &value); virtual int GetLineLength(long lineNo) const; virtual wxString GetLineText(long lineNo) const; @@ -129,10 +127,6 @@ public: // more readable flag testing methods // ---------------------------------- -#if 0 - // it seems now in wxTextCtrlBase - bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); } -#endif bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; } bool WrapLines() const { return false; } @@ -210,9 +204,6 @@ public: void SetModified() { m_modified = true; } - virtual void Freeze(); - virtual void Thaw(); - // textctrl specific scrolling virtual bool ScrollLines(int lines); virtual bool ScrollPages(int pages); @@ -271,6 +262,8 @@ protected: virtual wxSize DoGetBestSize() const; + virtual void DoSetValue(const wxString& value, int flags = 0); + friend class wxSourceUndoStep; wxSourceLineArray m_lines; @@ -366,7 +359,7 @@ private: // wxTextCtrl types // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler +class WXDLLIMPEXP_CORE wxStdTextCtrlInputHandler : public wxStdInputHandler { public: wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) {}