wxOSX build fix for wxRichTextCtrl after wxTextEntry::GetValue() renaming to DoGetValue()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -114,8 +114,6 @@ public:
|
|||||||
|
|
||||||
// Accessors
|
// Accessors
|
||||||
|
|
||||||
virtual wxString GetValue() const;
|
|
||||||
|
|
||||||
virtual wxString GetRange(long from, long to) const;
|
virtual wxString GetRange(long from, long to) const;
|
||||||
|
|
||||||
virtual int GetLineLength(long lineNo) const ;
|
virtual int GetLineLength(long lineNo) const ;
|
||||||
@@ -771,6 +769,12 @@ public:
|
|||||||
static const wxArrayString& GetAvailableFontNames();
|
static const wxArrayString& GetAvailableFontNames();
|
||||||
static void ClearAvailableFontNames();
|
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
|
// FIXME: this does not work, it allows this code to compile but will fail
|
||||||
// during run-time
|
// during run-time
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
@@ -781,8 +785,6 @@ public:
|
|||||||
virtual GtkEditable *GetEditable() const { return NULL; }
|
virtual GtkEditable *GetEditable() const { return NULL; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WX_FORWARD_TO_SCROLL_HELPER()
|
|
||||||
|
|
||||||
// Overrides
|
// Overrides
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
@@ -2294,7 +2294,7 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
|
|||||||
// set/get the controls text
|
// set/get the controls text
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
wxString wxRichTextCtrl::GetValue() const
|
wxString wxRichTextCtrl::DoGetValue() const
|
||||||
{
|
{
|
||||||
return GetBuffer().GetText();
|
return GetBuffer().GetText();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user