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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-08-25 18:03:23 +00:00
parent 270bae200d
commit 31f95a7faf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/richtext/richtextfontpage.cpp
View File

@@ -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) if (!m_sizeUnitsCtrl)
return; return;
if (m_sizeUnitsCtrl->GetSelection() == 1 && m_sizeListBox->IsShown()) if (m_sizeUnitsCtrl->GetSelection() == 1 && m_sizeListBox->IsShown())
{ {
m_fontListBoxParent->Show(m_sizeListBox, false); m_fontListBoxParent->Show(m_sizeListBox, false);