Use the encoding in StyleSetFont too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 1bd4e080d6b960e9909fd56206fa615b2ecbecec..b003480d48b570c671cb09d6ca3f5508854fb17c 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -2524,14 +2524,14 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
     int x, y;
     GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
 #endif
-    int      size     = font.GetPointSize();
-    wxString faceName = font.GetFaceName();
-    bool     bold     = font.GetWeight() == wxBOLD;
-    bool     italic   = font.GetStyle() != wxNORMAL;
-    bool     under    = font.GetUnderlined();
-
-    // TODO: add encoding/charset mapping
-    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
+    int            size     = font.GetPointSize();
+    wxString       faceName = font.GetFaceName();
+    bool           bold     = font.GetWeight() == wxBOLD;
+    bool           italic   = font.GetStyle() != wxNORMAL;
+    bool           under    = font.GetUnderlined();
+    wxFontEncoding encoding = font.GetDefaultEncoding();
+    
+    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }
 
 // Set all font style attributes at once.

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index 989a49401bf42536a577464d472d73068725e7b6..7735fd6109ea2f683fb11a79f59282eef6725220 100644 (file)
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -296,14 +296,14 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
     int x, y;
     GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
 #endif
-    int      size     = font.GetPointSize();
-    wxString faceName = font.GetFaceName();
-    bool     bold     = font.GetWeight() == wxBOLD;
-    bool     italic   = font.GetStyle() != wxNORMAL;
-    bool     under    = font.GetUnderlined();
-
-    // TODO: add encoding/charset mapping
-    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
+    int            size     = font.GetPointSize();
+    wxString       faceName = font.GetFaceName();
+    bool           bold     = font.GetWeight() == wxBOLD;
+    bool           italic   = font.GetStyle() != wxNORMAL;
+    bool           under    = font.GetUnderlined();
+    wxFontEncoding encoding = font.GetDefaultEncoding();
+    
+    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }
 
 // Set all font style attributes at once.

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 1bd4e080d6b960e9909fd56206fa615b2ecbecec..b003480d48b570c671cb09d6ca3f5508854fb17c 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -2524,14 +2524,14 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
     int x, y;
     GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
 #endif
-    int      size     = font.GetPointSize();
-    wxString faceName = font.GetFaceName();
-    bool     bold     = font.GetWeight() == wxBOLD;
-    bool     italic   = font.GetStyle() != wxNORMAL;
-    bool     under    = font.GetUnderlined();
-
-    // TODO: add encoding/charset mapping
-    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
+    int            size     = font.GetPointSize();
+    wxString       faceName = font.GetFaceName();
+    bool           bold     = font.GetWeight() == wxBOLD;
+    bool           italic   = font.GetStyle() != wxNORMAL;
+    bool           under    = font.GetUnderlined();
+    wxFontEncoding encoding = font.GetDefaultEncoding();
+    
+    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }
 
 // Set all font style attributes at once.

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 989a49401bf42536a577464d472d73068725e7b6..7735fd6109ea2f683fb11a79f59282eef6725220 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -296,14 +296,14 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
     int x, y;
     GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
 #endif
-    int      size     = font.GetPointSize();
-    wxString faceName = font.GetFaceName();
-    bool     bold     = font.GetWeight() == wxBOLD;
-    bool     italic   = font.GetStyle() != wxNORMAL;
-    bool     under    = font.GetUnderlined();
-
-    // TODO: add encoding/charset mapping
-    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
+    int            size     = font.GetPointSize();
+    wxString       faceName = font.GetFaceName();
+    bool           bold     = font.GetWeight() == wxBOLD;
+    bool           italic   = font.GetStyle() != wxNORMAL;
+    bool           under    = font.GetUnderlined();
+    wxFontEncoding encoding = font.GetDefaultEncoding();
+    
+    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }
 
 // Set all font style attributes at once.