From cadb1816842f50ff4349f42d5f1d5c9549287b7e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 26 Feb 2008 15:27:00 +0000 Subject: [PATCH] Fixed [ 1775674 ] Invalid color in picker dialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@52119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextfontpage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp index c63f0556ba..47444f2284 100644 --- a/src/richtext/richtextfontpage.cpp +++ b/src/richtext/richtextfontpage.cpp @@ -352,7 +352,7 @@ bool wxRichTextFontPage::TransferDataFromWindow() } else attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_TEXT_COLOUR)); - + if (m_strikethroughCtrl->Get3StateValue() != wxCHK_UNDETERMINED) { attr->SetTextEffectFlags(attr->GetTextEffectFlags() | wxTEXT_ATTR_EFFECT_STRIKETHROUGH); @@ -366,7 +366,7 @@ bool wxRichTextFontPage::TransferDataFromWindow() if (m_capitalsCtrl->Get3StateValue() != wxCHK_UNDETERMINED) { attr->SetTextEffectFlags(attr->GetTextEffectFlags() | wxTEXT_ATTR_EFFECT_CAPITALS); - + if (m_capitalsCtrl->Get3StateValue() == wxCHK_CHECKED) attr->SetTextEffects(attr->GetTextEffects() | wxTEXT_ATTR_EFFECT_CAPITALS); else @@ -445,7 +445,7 @@ bool wxRichTextFontPage::TransferDataToWindow() if (attr->HasTextColour()) { - m_colourCtrl->SetBackgroundColour(attr->GetTextColour()); + m_colourCtrl->SetColour(attr->GetTextColour()); m_colourPresent = true; } @@ -543,7 +543,7 @@ void wxRichTextFontPage::UpdatePreview() font.SetUnderlined(underlined); } - + int textEffects = 0; if (m_strikethroughCtrl->Get3StateValue() == wxCHK_CHECKED)