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 4e53f48eede01f1cc58dc11e32f006f0486d865d..2d1386c142969c02117b4bf12ba05ab1d7fc4c26 100644 (file)
--- 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 void WriteText(const wxString& text) { AddText(text); }

-    virtual wxString GetValue() const { return GetText(); }

     virtual void Remove(long from, long to)
     {
         Replace(from, to, "");
     virtual void Remove(long from, long to)
     {
         Replace(from, to, "");


@@ -3802,8 +3801,11 @@ public:
         return wxTextAreaBase::HitTest(pt, col, row);
     }
 
         return wxTextAreaBase::HitTest(pt, col, row);
     }
 

-#ifndef SWIG

 protected:
 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);
 
     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 716d9985c1e165291138e5db5da9262a86ebfa67..6398adbc8f24c4daedf0d5cc64efc418a5eabe62 100644 (file)
--- 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 void WriteText(const wxString& text) { AddText(text); }

-    virtual wxString GetValue() const { return GetText(); }

     virtual void Remove(long from, long to)
     {
         Replace(from, to, "");
     virtual void Remove(long from, long to)
     {
         Replace(from, to, "");


@@ -438,8 +437,11 @@ public:
         return wxTextAreaBase::HitTest(pt, col, row);
     }
 
         return wxTextAreaBase::HitTest(pt, col, row);
     }
 

-#ifndef SWIG

 protected:
 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);
 
     virtual bool DoLoadFile(const wxString& file, int fileType);
     virtual bool DoSaveFile(const wxString& file, int fileType);