check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 2b074eb7134cb479a16a5fd958c83d37fd7cc83c..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
 


@@ -21,6 +21,7 @@
 #include "wx/settings.h"
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/colour.h"
 #include "wx/font.h"

+#include "wx/gdicmn.h"

 #include "wx/module.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/module.h"
 
 // ----------------------------------------------------------------------------


@@ -47,13 +48,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
 
 
 
 
 
 

-wxColour wxSystemSettings::GetSystemColour(int WXUNUSED(index))
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))

 {
 {

-    // FIXME_MGL
+    // not implemented, the mean is in wxUniversal

     return wxColour(0,0,0);
 }
 
     return wxColour(0,0,0);
 }
 

-wxFont wxSystemSettings::GetSystemFont(int index)
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)

 {
     switch (index)
     {
 {
     switch (index)
     {


@@ -77,7 +78,7 @@ wxFont wxSystemSettings::GetSystemFont(int index)
     }
 }
 
     }
 }
 

-int wxSystemSettings::GetSystemMetric(int WXUNUSED(index))
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))

 {
     int val;
     
 {
     int val;
     


@@ -94,12 +95,11 @@ int wxSystemSettings::GetSystemMetric(int WXUNUSED(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

     }
 }
 
     }
 }
 

-bool wxSystemSettings::GetCapability(int index)
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)

 {
     switch (index)
     {
 {
     switch (index)
     {