Use the encoding in StyleSetFont too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-04-21 20:29:59 +00:00
parent 498a1eeb8d
commit af0531a5a8
4 changed files with 32 additions and 32 deletions

View File

@@ -2529,9 +2529,9 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
bool bold = font.GetWeight() == wxBOLD; bool bold = font.GetWeight() == wxBOLD;
bool italic = font.GetStyle() != wxNORMAL; bool italic = font.GetStyle() != wxNORMAL;
bool under = font.GetUnderlined(); bool under = font.GetUnderlined();
wxFontEncoding encoding = font.GetDefaultEncoding();
// TODO: add encoding/charset mapping StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
} }
// Set all font style attributes at once. // Set all font style attributes at once.

View File

@@ -301,9 +301,9 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
bool bold = font.GetWeight() == wxBOLD; bool bold = font.GetWeight() == wxBOLD;
bool italic = font.GetStyle() != wxNORMAL; bool italic = font.GetStyle() != wxNORMAL;
bool under = font.GetUnderlined(); bool under = font.GetUnderlined();
wxFontEncoding encoding = font.GetDefaultEncoding();
// TODO: add encoding/charset mapping StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
} }
// Set all font style attributes at once. // Set all font style attributes at once.

View File

@@ -2529,9 +2529,9 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
bool bold = font.GetWeight() == wxBOLD; bool bold = font.GetWeight() == wxBOLD;
bool italic = font.GetStyle() != wxNORMAL; bool italic = font.GetStyle() != wxNORMAL;
bool under = font.GetUnderlined(); bool under = font.GetUnderlined();
wxFontEncoding encoding = font.GetDefaultEncoding();
// TODO: add encoding/charset mapping StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
} }
// Set all font style attributes at once. // Set all font style attributes at once.

View File

@@ -301,9 +301,9 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
bool bold = font.GetWeight() == wxBOLD; bool bold = font.GetWeight() == wxBOLD;
bool italic = font.GetStyle() != wxNORMAL; bool italic = font.GetStyle() != wxNORMAL;
bool under = font.GetUnderlined(); bool under = font.GetUnderlined();
wxFontEncoding encoding = font.GetDefaultEncoding();
// TODO: add encoding/charset mapping StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
} }
// Set all font style attributes at once. // Set all font style attributes at once.