From f51723055aa4334a355a19e87bb2b478b4204d15 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 27 Feb 2009 10:54:12 +0000 Subject: [PATCH] Fixed wxRichTextCtrl base class git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/richtext/richtextctrl.h | 7 +++++-- src/richtext/richtextctrl.cpp | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h index a68f6d1397..2cd8ddab47 100644 --- a/include/wx/richtext/richtextctrl.h +++ b/include/wx/richtext/richtextctrl.h @@ -86,8 +86,7 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleDefinition; * wxRichTextCtrl class declaration */ -class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxControl, - public wxTextCtrlIface, +class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxTextCtrlBase, public wxScrollHelper { DECLARE_CLASS( wxRichTextCtrl ) @@ -772,6 +771,10 @@ public: static const wxArrayString& GetAvailableFontNames(); static void ClearAvailableFontNames(); +#ifdef __WXMSW__ + virtual WXHWND GetEditHWND() const { return GetHWND(); } +#endif + WX_FORWARD_TO_SCROLL_HELPER() // Overrides diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index c24ce44d6a..c5d22f1600 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -196,7 +196,7 @@ wxRichTextCtrl::wxRichTextCtrl(wxWindow* parent, bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { - if (!wxControl::Create(parent, id, pos, size, + if (!wxTextCtrlBase::Create(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE, validator, name)) return false; @@ -2870,7 +2870,7 @@ bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttr& style) /// Set font, and also the buffer attributes bool wxRichTextCtrl::SetFont(const wxFont& font) { - wxControl::SetFont(font); + wxTextCtrlBase::SetFont(font); wxTextAttr attr = GetBuffer().GetAttributes(); attr.SetFont(font); -- 2.45.2