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 8ad12fc890bfa65f5be7870c2911c8f9771c31ca..24132c37275e972b28e2ec1aba2e8d42681a3243 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -2,12 +2,12 @@
 // Name:        settings.h
 // Author:      Vaclav Slavik, Robert Roebling
 // Id:          $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "settings.h"
 #endif
 
 #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;
     
 {
     int val;
     


@@ -95,8 +95,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             return 15; 
             break;
         default:
             return 15; 
             break;
         default:

-            wxCHECK_MSG(index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented"));
-            return 0;
+            return -1;  // unsupported metric

     }
 }
 
     }
 }