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

Fixed [ 1775674 ] Invalid color in picker dialog

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@52119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-02-26 15:27:00 +00:00
parent 5816d21269
commit cadb181684
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/richtext/richtextfontpage.cpp
View File

@@ -352,7 +352,7 @@ bool wxRichTextFontPage::TransferDataFromWindow()
} }
else else
attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_TEXT_COLOUR)); attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_TEXT_COLOUR));
if (m_strikethroughCtrl->Get3StateValue() != wxCHK_UNDETERMINED) if (m_strikethroughCtrl->Get3StateValue() != wxCHK_UNDETERMINED)
{ {
attr->SetTextEffectFlags(attr->GetTextEffectFlags() | wxTEXT_ATTR_EFFECT_STRIKETHROUGH); attr->SetTextEffectFlags(attr->GetTextEffectFlags() | wxTEXT_ATTR_EFFECT_STRIKETHROUGH);
@@ -366,7 +366,7 @@ bool wxRichTextFontPage::TransferDataFromWindow()
if (m_capitalsCtrl->Get3StateValue() != wxCHK_UNDETERMINED) if (m_capitalsCtrl->Get3StateValue() != wxCHK_UNDETERMINED)
{ {
attr->SetTextEffectFlags(attr->GetTextEffectFlags() | wxTEXT_ATTR_EFFECT_CAPITALS); attr->SetTextEffectFlags(attr->GetTextEffectFlags() | wxTEXT_ATTR_EFFECT_CAPITALS);
if (m_capitalsCtrl->Get3StateValue() == wxCHK_CHECKED) if (m_capitalsCtrl->Get3StateValue() == wxCHK_CHECKED)
attr->SetTextEffects(attr->GetTextEffects() | wxTEXT_ATTR_EFFECT_CAPITALS); attr->SetTextEffects(attr->GetTextEffects() | wxTEXT_ATTR_EFFECT_CAPITALS);
else else
@@ -445,7 +445,7 @@ bool wxRichTextFontPage::TransferDataToWindow()
if (attr->HasTextColour()) if (attr->HasTextColour())
{ {
m_colourCtrl->SetBackgroundColour(attr->GetTextColour()); m_colourCtrl->SetColour(attr->GetTextColour());
m_colourPresent = true; m_colourPresent = true;
} }
@@ -543,7 +543,7 @@ void wxRichTextFontPage::UpdatePreview()
font.SetUnderlined(underlined); font.SetUnderlined(underlined);
} }
int textEffects = 0; int textEffects = 0;
if (m_strikethroughCtrl->Get3StateValue() == wxCHK_CHECKED) if (m_strikethroughCtrl->Get3StateValue() == wxCHK_CHECKED)