The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

[wxWidgets.git] / contrib / src / stc / stc.cpp

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 1bd4e080d6b960e9909fd56206fa615b2ecbecec..86a9690efb7ffcfe82919a28c1cc80498690c6a8 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 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.GetEncoding();
+    
+    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);

 }
 
 // Set all font style attributes at once.
 }
 
 // Set all font style attributes at once.