respect the encoding of the text style and not only the global control font encoding...

[wxWidgets.git] / src / msw / settings.cpp

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index bee65992b7a4510ee1ceb5816fb5cf8be3075295..c15da355e7fd846f32aa3a9f6c910894903cca61 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -228,7 +228,7 @@ wxFont wxCreateFontFromStockObject(int index)
             // We want Windows 2000 or later to have new fonts even MS Shell Dlg
             // is returned as default GUI font for compatibility
             int verMaj;
             // We want Windows 2000 or later to have new fonts even MS Shell Dlg
             // is returned as default GUI font for compatibility
             int verMaj;

-            if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
+            if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)

                 wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
 #endif
             // Under MicroWindows we pass the HFONT as well
                 wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
 #endif
             // Under MicroWindows we pass the HFONT as well


@@ -449,12 +449,12 @@ extern wxFont wxGetCCDefaultFont()
     int verMaj, verMin;
     switch ( wxGetOsVersion(&verMaj, &verMin) )
     {
     int verMaj, verMin;
     switch ( wxGetOsVersion(&verMaj, &verMin) )
     {

-        case wxWIN95:
+        case wxOS_WINDOWS_9X:

             // 4.10 is Win98
             useIconFont = verMaj == 4 && verMin >= 10;
             break;
 
             // 4.10 is Win98
             useIconFont = verMaj == 4 && verMin >= 10;
             break;
 

-        case wxWINDOWS_NT:
+        case wxOS_WINDOWS_NT:

             // 5.0 is Win2k
             useIconFont = verMaj >= 5;
             break;
             // 5.0 is Win2k
             useIconFont = verMaj >= 5;
             break;