Fix for indeterminate attribute specification

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp
index 4d994ad1ba5e839510743156e11e4ef11d7b0f95..d0461d723f206d49094d5a2db056afb3c45256a2 100644 (file)
--- 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->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)
     {
 
     if (m_capitalsCtrl->Get3StateValue() != wxCHK_UNDETERMINED)
     {


@@ -410,6 +415,11 @@ bool wxRichTextFontPage::TransferDataFromWindow()
         else
             attr->SetTextEffects(attr->GetTextEffects() & ~wxTEXT_ATTR_EFFECT_CAPITALS);
     }
         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)
     {
 
     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) );
         // 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;
     }
 
     return true;