X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/128fae4632467570719d05cc515391297ff7f980..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/richtext/richtextctrl.h?ds=sidebyside diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index 5d60b8e042..a0ecffeacf 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 ; @@ -666,9 +664,6 @@ public: virtual bool RecreateBuffer(const wxSize& size = wxDefaultSize); #endif - /// Set the selection - virtual void DoSetSelection(long from, long to, bool scrollCaret = true); - /// Write text virtual void DoWriteText(const wxString& value, int flags = 0); @@ -771,21 +766,25 @@ 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__ virtual WXHWND GetEditHWND() const { return GetHWND(); } #endif -#ifdef __WXGTK__ - // implement this to return the associated window, it will be used for - // event generation - virtual const wxWindow *GetEditableWindow() const { return NULL; } - - // implement this to return the associated GtkEntry or another widget - // implementing GtkEditable +#ifdef __WXMOTIF__ + virtual WXWidget GetTextWidget() const { return NULL; } +#endif +#ifdef __WXGTK20__ + virtual wxWindow *GetEditableWindow() { return this; } virtual GtkEditable *GetEditable() const { return NULL; } #endif - WX_FORWARD_TO_SCROLL_HELPER() - // Overrides protected: