Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wxRichTextCtrl base class

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-02-27 10:54:12 +00:00
parent 2d8c0c2ce4
commit f51723055a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/richtext/richtextctrl.h
View File

@@ -86,8 +86,7 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleDefinition;
* wxRichTextCtrl class declaration * wxRichTextCtrl class declaration
*/ */
class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxControl, class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxTextCtrlBase,
public wxTextCtrlIface,
public wxScrollHelper public wxScrollHelper
{ {
DECLARE_CLASS( wxRichTextCtrl ) DECLARE_CLASS( wxRichTextCtrl )
@@ -772,6 +771,10 @@ public:
static const wxArrayString& GetAvailableFontNames(); static const wxArrayString& GetAvailableFontNames();
static void ClearAvailableFontNames(); static void ClearAvailableFontNames();
#ifdef __WXMSW__
virtual WXHWND GetEditHWND() const { return GetHWND(); }
#endif
WX_FORWARD_TO_SCROLL_HELPER() WX_FORWARD_TO_SCROLL_HELPER()
// Overrides // Overrides

4
src/richtext/richtextctrl.cpp
View File

@@ -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, bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style,
const wxValidator& validator, const wxString& name) 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, style|wxFULL_REPAINT_ON_RESIZE,
validator, name)) validator, name))
return false; return false;
@@ -2870,7 +2870,7 @@ bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttr& style)
/// Set font, and also the buffer attributes /// Set font, and also the buffer attributes
bool wxRichTextCtrl::SetFont(const wxFont& font) bool wxRichTextCtrl::SetFont(const wxFont& font)
{ {
wxControl::SetFont(font); wxTextCtrlBase::SetFont(font);
wxTextAttr attr = GetBuffer().GetAttributes(); wxTextAttr attr = GetBuffer().GetAttributes();
attr.SetFont(font); attr.SetFont(font);