X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c41c20a566cb7558661a68c0ed6712a84982093f..21bd196564d8483879a57c40ec1eea64114f9bd4:/src/mgl/settings.cpp diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp index 355db0d4f6..24132c3727 100644 --- a/src/mgl/settings.cpp +++ b/src/mgl/settings.cpp @@ -7,7 +7,7 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "settings.h" #endif @@ -78,7 +78,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) } } -int wxSystemSettingsNative::GetMetric(wxSystemMetric index) +int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win)) { int val; @@ -95,8 +95,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index) return 15; break; default: - wxCHECK_MSG(index, 0, wxT("wxSystemSettings::GetMetric not fully implemented")); - return 0; + return -1; // unsupported metric } }