X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46697f31a56e92d865bb7a90a6093de14d4e8e5f..bdebb379299aaf1ee588dbe15968829df49ccedc:/src/msw/settings.cpp diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp index b4436ce624..af0dfa0adb 100644 --- a/src/msw/settings.cpp +++ b/src/msw/settings.cpp @@ -377,7 +377,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 @@ -438,7 +438,7 @@ extern wxFont wxGetCCDefaultFont() { case wxWIN95: // 4.10 is Win98 - useIconFont = verMin == 4 && verMin >= 10; + useIconFont = verMaj == 4 && verMin >= 10; break; case wxWINDOWS_NT: