X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6519b40fe9f5e4706e02497fe01ff71c65079d6..96defed03c190cb602ed4f7ca6e962a49e10dddd:/include/wx/x11/textctrl.h diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h index f201439b07..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,10 +115,6 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual wxString GetValue() const; - virtual void SetValue(const wxString& value) - { ChangeValue(value); SendTextUpdatedEvent(); } - virtual void ChangeValue(const wxString &value); virtual int GetLineLength(long lineNo) const; @@ -132,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; } @@ -213,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); @@ -274,6 +262,8 @@ protected: virtual wxSize DoGetBestSize() const; + virtual void DoSetValue(const wxString& value, int flags = 0); + friend class wxSourceUndoStep; wxSourceLineArray m_lines; @@ -369,7 +359,7 @@ private: // wxTextCtrl types // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler +class WXDLLIMPEXP_CORE wxStdTextCtrlInputHandler : public wxStdInputHandler { public: wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) {}