AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added flags to SetStyle with specific object

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2012-04-23 16:54:52 +00:00
parent ac03e0173b
commit e059e1bb33
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -686,7 +686,7 @@ public:
/** /**
Sets the attributes for a single object Sets the attributes for a single object
*/ */
virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr); virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
//@{ //@{
/** /**

2
interface/wx/richtext/richtextctrl.h
View File

@ -652,7 +652,7 @@ public:
/** /**
Sets the attributes for a single object Sets the attributes for a single object
*/ */
virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr); virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
//@{ //@{
/** /**

4
src/richtext/richtextctrl.cpp
View File

@ -3588,9 +3588,9 @@ bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr
return GetFocusObject()->SetStyle(range.ToInternal(), style); return GetFocusObject()->SetStyle(range.ToInternal(), style);
} }
void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr) void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags)
{ {
GetFocusObject()->SetStyle(obj, textAttr); GetFocusObject()->SetStyle(obj, textAttr, flags);
} }
// extended style setting operation with flags including: // extended style setting operation with flags including:

4
src/richtext/richtextformatdlg.cpp
View File

@ -144,11 +144,11 @@ bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, const wxRichTe
} }
// Apply attributes to the object being edited, if any // Apply attributes to the object being edited, if any
bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, int WXUNUSED(flags)) bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, int flags)
{ {
if (GetObject()) if (GetObject())
{ {
ctrl->SetStyle(GetObject(), m_attributes); ctrl->SetStyle(GetObject(), m_attributes, flags);
return true; return true;
} }
else else