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

Applied patch #13534: wxRichTextCtrl: Make it easier to use TextEffects flags

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-10-22 13:19:40 +00:00
parent 23d11f0eb4
commit 75936ec600
7 changed files with 155 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/richtext/richtextctrl.cpp
View File

@@ -3510,7 +3510,7 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)
return true;
}
/// Is all of the selection bold?
/// Is all of the selection, or the current caret position, bold?
bool wxRichTextCtrl::IsSelectionBold()
{
if (HasSelection())
@@ -3540,7 +3540,7 @@ bool wxRichTextCtrl::IsSelectionBold()
return false;
}
/// Is all of the selection italics?
/// Is all of the selection, or the current caret position, italics?
bool wxRichTextCtrl::IsSelectionItalics()
{
if (HasSelection())
@@ -3570,7 +3570,7 @@ bool wxRichTextCtrl::IsSelectionItalics()
return false;
}
/// Is all of the selection underlined?
/// Is all of the selection, or the current caret position, underlined?
bool wxRichTextCtrl::IsSelectionUnderlined()
{
if (HasSelection())
@@ -3600,6 +3600,33 @@ bool wxRichTextCtrl::IsSelectionUnderlined()
return false;
}
/// Does all of the selection, or the current caret position, have this wxTextAttrEffects flag(s)?
bool wxRichTextCtrl::DoesSelectionHaveTextEffectFlag(int flag)
{
wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_EFFECTS);
attr.SetTextEffectFlags(flag);
attr.SetTextEffects(flag);
if (HasSelection())
{
return HasCharacterAttributes(GetSelectionRange(), attr);
}
else
{
// If no selection, then we need to combine current style with default style
// to see what the effect would be if we started typing.
long pos = GetAdjustedCaretPosition(GetCaretPosition());
if (GetStyle(pos, attr))
{
if (IsDefaultStyleShowing())
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
return (attr.GetTextEffectFlags() & flag);
}
}
return false;
}
/// Apply bold to the selection
bool wxRichTextCtrl::ApplyBoldToSelection()
{
@@ -3654,6 +3681,28 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection()
return true;
}
/// Apply the wxTextAttrEffects flag(s) to the selection, or the current caret position if there's no selection
bool wxRichTextCtrl::ApplyTextEffectToSelection(int flags)
{
wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_EFFECTS);
attr.SetTextEffectFlags(flags);
if (!DoesSelectionHaveTextEffectFlag(flags))
attr.SetTextEffects(flags);
else
attr.SetTextEffects(attr.GetTextEffectFlags() & ~flags);
if (HasSelection())
return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
else
{
wxRichTextAttr current = GetDefaultStyleEx();
current.Apply(attr);
SetAndShowDefaultStyle(current);
}
return true;
}
/// Is all of the selection aligned according to the specified flag?
bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment)
{