Warning fixes after recent library changes.

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 355db0d4f6ba1cabe7031da87be68fcabfccf349..24132c37275e972b28e2ec1aba2e8d42681a3243 100644 (file)
--- 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
     }
 }