cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 32059690a750f519e5ae1314217c99c96c93572b..76d77a96bfceb083f2d395fa53bd494136ecbdb9 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -172,7 +172,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
                         index = wxSYS_COLOUR_MENU ;
                 }
             }
-       }
+        }
 
         if ( useDefault )
         {
@@ -225,6 +225,13 @@ wxFont wxCreateFontFromStockObject(int index)
         {
             wxNativeFontInfo info;
             info.lf = lf;
+#ifndef __WXWINCE__
+            // 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)
+                wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
+#endif
             // Under MicroWindows we pass the HFONT as well
             // because it's hard to convert HFONT -> LOGFONT -> HFONT
             // It's OK to delete stock objects, the delete will be ignored.
@@ -260,7 +267,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 
     return *gs_fontDefault;
 #else // !__WXWINCE__
-    // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
+    // wxWindow ctor calls GetFont(wxSYS_DEFAULT_GUI_FONT) so we're
     // called fairly often -- this is why we cache this particular font
     const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
     if ( isDefaultRequested )
@@ -377,7 +384,7 @@ static const int gs_metricsMap[] =
 };
 
 // Get a system metric, e.g. scrollbar size
-int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
 {
 #ifdef __WXMICROWIN__
     // TODO: probably use wxUniv themes functionality
@@ -390,7 +397,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
     if ( indexMSW == -1 )
     {
         // not supported under current system
-        return 0;
+        return -1;
     }
 
     int rc = ::GetSystemMetrics(indexMSW);
@@ -438,7 +445,7 @@ extern wxFont wxGetCCDefaultFont()
     {
         case wxWIN95:
             // 4.10 is Win98
-            useIconFont = verMin == 4 && verMin >= 10;
+            useIconFont = verMaj == 4 && verMin >= 10;
             break;
 
         case wxWINDOWS_NT: