check for NULL pointer in OnMeasureItem() as well as in OnDrawItem()

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

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index b003480d48b570c671cb09d6ca3f5508854fb17c..86a9690efb7ffcfe82919a28c1cc80498690c6a8 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -2529,7 +2529,7 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
     bool           bold     = font.GetWeight() == wxBOLD;
     bool           italic   = font.GetStyle() != wxNORMAL;
     bool           under    = font.GetUnderlined();
     bool           bold     = font.GetWeight() == wxBOLD;
     bool           italic   = font.GetStyle() != wxNORMAL;
     bool           under    = font.GetUnderlined();

-    wxFontEncoding encoding = font.GetDefaultEncoding();
+    wxFontEncoding encoding = font.GetEncoding();

     
     StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }
     
     StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }