X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d8268a1d64de58aab194e4d8ae800c755990aad..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/x11/textctrl.h diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h index 2e3b528c74..c0c750baa1 100644 --- a/include/wx/x11/textctrl.h +++ b/include/wx/x11/textctrl.h @@ -19,10 +19,6 @@ #include "wx/univ/textctrl.h" #else -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "textctrl.h" -#endif - #include "wx/scrolwin.h" #include "wx/arrstr.h" #include "wx/datetime.h" @@ -31,7 +27,7 @@ // classes //----------------------------------------------------------------------------- -class wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; //----------------------------------------------------------------------------- // helpers @@ -89,7 +85,7 @@ enum wxSourceLanguage // wxTextCtrl //----------------------------------------------------------------------------- -class wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper +class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper { public: wxTextCtrl() { Init(); } @@ -120,8 +116,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; @@ -133,10 +128,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; } @@ -275,6 +266,8 @@ protected: virtual wxSize DoGetBestSize() const; + virtual void DoSetValue(const wxString& value, int flags = 0); + friend class wxSourceUndoStep; wxSourceLineArray m_lines;