Fixed wxRichTextCtrl base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user