From f5b7586bfe3b6da4a565393aed2a6229e6a009d0 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 4 Oct 2010 09:27:52 +0000 Subject: [PATCH] Removed redundant GetEditableWindow on GTK+ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/richtext/richtextctrl.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index bb34cdc9b7..f2d976a6dd 100644 --- a/include/wx/richtext/richtextctrl.h +++ b/include/wx/richtext/richtextctrl.h @@ -201,9 +201,6 @@ public: virtual bool DoSaveFile(const wxString& file = wxEmptyString, int fileType = wxRICHTEXT_TYPE_ANY); - // implement the wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() { return this; } - /// Set the handler flags, controlling loading and saving void SetHandlerFlags(int flags) { GetBuffer().SetHandlerFlags(flags); } @@ -825,6 +822,9 @@ public: virtual wxString DoGetValue() const; protected: + // implement the wxTextEntry pure virtual method + virtual wxWindow *GetEditableWindow() { return this; } + // FIXME: this does not work, it allows this code to compile but will fail // during run-time #ifndef __WXUNIVERSAL__ @@ -835,7 +835,6 @@ protected: virtual WXWidget GetTextWidget() const { return NULL; } #endif #ifdef __WXGTK20__ - virtual wxWindow *GetEditableWindow() { return this; } virtual GtkEditable *GetEditable() const { return NULL; } virtual GtkEntry *GetEntry() const { return NULL; } #endif -- 2.50.0