Fixed a problem with text effects flag always being set on dialog exit

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

diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp
index 89c9f1e023adc8c61014227c32f3f7c774c1c796..32427ab2ba330ac31e14423fcaff65ddc52bb9f3 100644 (file)
--- a/src/richtext/richtextfontpage.cpp
+++ b/src/richtext/richtextfontpage.cpp
@@ -475,6 +475,9 @@ bool wxRichTextFontPage::TransferDataFromWindow()
         attr->SetTextEffects(attr->GetTextEffects() & ~(wxTEXT_ATTR_EFFECT_SUBSCRIPT|wxTEXT_ATTR_EFFECT_SUPERSCRIPT) );
     }
 
         attr->SetTextEffects(attr->GetTextEffects() & ~(wxTEXT_ATTR_EFFECT_SUBSCRIPT|wxTEXT_ATTR_EFFECT_SUPERSCRIPT) );
     }
 

+    if (attr->GetTextEffectFlags() == 0)
+        attr->SetFlags(attr->GetFlags() & ~wxTEXT_ATTR_EFFECTS);
+

     return true;
 }
 
     return true;
 }
 


@@ -1044,7 +1047,7 @@ void wxRichTextFontPage::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     if (!m_sizeUnitsCtrl)
         return;
 {
     if (!m_sizeUnitsCtrl)
         return;

-        
+

     if (m_sizeUnitsCtrl->GetSelection() == 1 && m_sizeListBox->IsShown())
     {
         m_fontListBoxParent->Show(m_sizeListBox, false);
     if (m_sizeUnitsCtrl->GetSelection() == 1 && m_sizeListBox->IsShown())
     {
         m_fontListBoxParent->Show(m_sizeListBox, false);