From: Vadim Zeitlin Date: Mon, 2 Mar 2009 16:23:55 +0000 (+0000) Subject: build fix: define DoGetValue() and GetEditableWindow() X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d0a22afc382f9f33b8b209b61b32cacd2cfc6b97?ds=sidebyside build fix: define DoGetValue() and GetEditableWindow() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 4e53f48eed..2d1386c142 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -3649,7 +3649,6 @@ public: // ---------------------------------------------- virtual void WriteText(const wxString& text) { AddText(text); } - virtual wxString GetValue() const { return GetText(); } virtual void Remove(long from, long to) { Replace(from, to, ""); @@ -3802,8 +3801,11 @@ public: return wxTextAreaBase::HitTest(pt, col, row); } -#ifndef SWIG protected: + virtual wxString DoGetValue() const { return GetText(); } + virtual wxWindow *GetEditableWindow() { return this; } + +#ifndef SWIG virtual bool DoLoadFile(const wxString& file, int fileType); virtual bool DoSaveFile(const wxString& file, int fileType); diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index 716d9985c1..6398adbc8f 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -285,7 +285,6 @@ public: // ---------------------------------------------- virtual void WriteText(const wxString& text) { AddText(text); } - virtual wxString GetValue() const { return GetText(); } virtual void Remove(long from, long to) { Replace(from, to, ""); @@ -438,8 +437,11 @@ public: return wxTextAreaBase::HitTest(pt, col, row); } -#ifndef SWIG protected: + virtual wxString DoGetValue() const { return GetText(); } + virtual wxWindow *GetEditableWindow() { return this; } + +#ifndef SWIG virtual bool DoLoadFile(const wxString& file, int fileType); virtual bool DoSaveFile(const wxString& file, int fileType);