diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index ec5507cf68..203b732e34 100644 --- a/include/wx/richtext/richtextctrl.h +++ b/include/wx/richtext/richtextctrl.h @@ -114,8 +114,6 @@ public: // Accessors - virtual wxString GetValue() const; - virtual wxString GetRange(long from, long to) const; virtual int GetLineLength(long lineNo) const ; @@ -771,6 +769,12 @@ public: static const wxArrayString& GetAvailableFontNames(); static void ClearAvailableFontNames(); + WX_FORWARD_TO_SCROLL_HELPER() + + // implement wxTextEntry methods + virtual wxString DoGetValue() const; + +protected: // FIXME: this does not work, it allows this code to compile but will fail // during run-time #ifdef __WXMSW__ @@ -781,8 +785,6 @@ public: virtual GtkEditable *GetEditable() const { return NULL; } #endif - WX_FORWARD_TO_SCROLL_HELPER() - // Overrides protected: diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index c5d22f1600..68fd792f2c 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -2294,7 +2294,7 @@ wxRichTextCtrl::HitTest(const wxPoint& pt, // set/get the controls text // ---------------------------------------------------------------------------- -wxString wxRichTextCtrl::GetValue() const +wxString wxRichTextCtrl::DoGetValue() const { return GetBuffer().GetText(); }