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

Applied #10639 (Not all previewed fonts are displayed with the correct nameface)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-24 07:36:00 +00:00
parent 8932702b0c
commit a0b4f26342
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/richtext/richtextfontpage.cpp
View File

@@ -587,7 +587,7 @@ wxTextAttrEx* wxRichTextFontPage::GetAttributes()
/// Updates the font preview /// Updates the font preview
void wxRichTextFontPage::UpdatePreview() void wxRichTextFontPage::UpdatePreview()
{ {
wxFont font(*wxNORMAL_FONT); wxRichTextAttr attr;
if (m_colourPresent) if (m_colourPresent)
m_previewCtrl->SetForegroundColour(m_colourCtrl->GetColour()); m_previewCtrl->SetForegroundColour(m_colourCtrl->GetColour());
@@ -598,7 +598,7 @@ void wxRichTextFontPage::UpdatePreview()
if (m_faceListBox->GetSelection() != wxNOT_FOUND) if (m_faceListBox->GetSelection() != wxNOT_FOUND)
{ {
wxString faceName = m_faceListBox->GetFaceName(m_faceListBox->GetSelection()); wxString faceName = m_faceListBox->GetFaceName(m_faceListBox->GetSelection());
font.SetFaceName(faceName); attr.SetFontFaceName(faceName);
} }
wxString strSize = m_sizeTextCtrl->GetValue(); wxString strSize = m_sizeTextCtrl->GetValue();
@@ -606,7 +606,7 @@ void wxRichTextFontPage::UpdatePreview()
{ {
int sz = wxAtoi(strSize); int sz = wxAtoi(strSize);
if (sz > 0) if (sz > 0)
font.SetPointSize(sz); attr.SetFontSize(sz);
} }
if (m_styleCtrl->GetSelection() != wxNOT_FOUND) if (m_styleCtrl->GetSelection() != wxNOT_FOUND)
@@ -617,7 +617,7 @@ void wxRichTextFontPage::UpdatePreview()
else else
style = wxNORMAL; style = wxNORMAL;
font.SetStyle(style); attr.SetFontStyle(style);
} }
if (m_weightCtrl->GetSelection() != wxNOT_FOUND) if (m_weightCtrl->GetSelection() != wxNOT_FOUND)
@@ -628,7 +628,7 @@ void wxRichTextFontPage::UpdatePreview()
else else
weight = wxNORMAL; weight = wxNORMAL;
font.SetWeight(weight); attr.SetFontWeight(weight);
} }
if (m_underliningCtrl->GetSelection() != wxNOT_FOUND) if (m_underliningCtrl->GetSelection() != wxNOT_FOUND)
@@ -639,7 +639,7 @@ void wxRichTextFontPage::UpdatePreview()
else else
underlined = false; underlined = false;
font.SetUnderlined(underlined); attr.SetFontUnderlined(underlined);
} }
int textEffects = 0; int textEffects = 0;
@@ -659,6 +659,7 @@ void wxRichTextFontPage::UpdatePreview()
else if ( m_subscriptCtrl->Get3StateValue() == wxCHK_CHECKED ) else if ( m_subscriptCtrl->Get3StateValue() == wxCHK_CHECKED )
textEffects |= wxTEXT_ATTR_EFFECT_SUBSCRIPT; textEffects |= wxTEXT_ATTR_EFFECT_SUBSCRIPT;
wxFont font = attr.CreateFont();
m_previewCtrl->SetFont(font); m_previewCtrl->SetFont(font);
m_previewCtrl->SetTextEffects(textEffects); m_previewCtrl->SetTextEffects(textEffects);
m_previewCtrl->Refresh(); m_previewCtrl->Refresh();