X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a756f210019dd5b51331b7181c816d3882146a30..2296fe5018d42d4e0bf9df07c37d31f60d972b32:/src/mgl/settings.cpp diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp index d3b4828427..24132c3727 100644 --- a/src/mgl/settings.cpp +++ b/src/mgl/settings.cpp @@ -2,12 +2,12 @@ // Name: settings.h // Author: Vaclav Slavik, Robert Roebling // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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 } }