From a2c2fdc57030f866df510caed97c9355969c9d80 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 22 Oct 2011 13:49:00 +0000 Subject: [PATCH] Fix for indeterminate attribute specification git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextfontpage.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp index 4d994ad1ba..d0461d723f 100644 --- a/src/richtext/richtextfontpage.cpp +++ b/src/richtext/richtextfontpage.cpp @@ -400,6 +400,11 @@ bool wxRichTextFontPage::TransferDataFromWindow() else attr->SetTextEffects(attr->GetTextEffects() & ~wxTEXT_ATTR_EFFECT_STRIKETHROUGH); } + else + { + attr->SetTextEffectFlags(attr->GetTextEffectFlags() & ~wxTEXT_ATTR_EFFECT_STRIKETHROUGH); + attr->SetTextEffects(attr->GetTextEffects() & ~wxTEXT_ATTR_EFFECT_STRIKETHROUGH); + } if (m_capitalsCtrl->Get3StateValue() != wxCHK_UNDETERMINED) { @@ -410,6 +415,11 @@ bool wxRichTextFontPage::TransferDataFromWindow() else attr->SetTextEffects(attr->GetTextEffects() & ~wxTEXT_ATTR_EFFECT_CAPITALS); } + else + { + attr->SetTextEffectFlags(attr->GetTextEffectFlags() & ~wxTEXT_ATTR_EFFECT_CAPITALS); + attr->SetTextEffects(attr->GetTextEffects() & ~wxTEXT_ATTR_EFFECT_CAPITALS); + } if (m_superscriptCtrl->Get3StateValue() == wxCHK_CHECKED) { @@ -428,6 +438,7 @@ bool wxRichTextFontPage::TransferDataFromWindow() // If they are undetermined, we don't want to include these flags in the text effects - the objects // should retain their original style. attr->SetTextEffectFlags(attr->GetTextEffectFlags() & ~(wxTEXT_ATTR_EFFECT_SUBSCRIPT|wxTEXT_ATTR_EFFECT_SUPERSCRIPT) ); + attr->SetTextEffects(attr->GetTextEffects() & ~(wxTEXT_ATTR_EFFECT_SUBSCRIPT|wxTEXT_ATTR_EFFECT_SUPERSCRIPT) ); } return true; -- 2.45.2