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

diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index ec5507cf686fda3e33299970561846c89748cb8b..203b732e34f13fc8383c10ac3ac502fb8930d625 100644 (file)
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -114,8 +114,6 @@ public:
 
 // Accessors
 
 
 // Accessors
 

-    virtual wxString GetValue() const;
-

     virtual wxString GetRange(long from, long to) const;
 
     virtual int GetLineLength(long lineNo) 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();
 
      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__
      // 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
 
     virtual GtkEditable *GetEditable() const { return NULL; }
 #endif
 

-     WX_FORWARD_TO_SCROLL_HELPER()
-

 // Overrides
 protected:
 
 // Overrides
 protected:
 

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index c5d22f1600c99fcd7b1f3218d1b6a4affa32be12..68fd792f2c4f7e12b088355654aa702a487698b5 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -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();
 }