fixing 10.5 only compiles

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index fb58cf774578077616c71ebd7c84c43b5a563524..93224a6c295b4a39777d213084a44708e6489362 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -1,16 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        settings.h
+// Name:        src/mgl/settings.cpp
 // Author:      Vaclav Slavik, Robert Roebling
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:    wxWindows licence
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __GNUG__
-#pragma implementation "settings.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,9 +14,13 @@
 #endif
 
 #include "wx/settings.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/module.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+    #include "wx/font.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // global data
@@ -32,7 +31,7 @@ static wxFont *gs_fontDefault = NULL;
 class wxSystemSettingsModule : public wxModule
 {
 public:
-    virtual bool OnInit() { return TRUE; }
+    virtual bool OnInit() { return true; }
     virtual void OnExit()
     {
         delete gs_fontDefault;
@@ -47,13 +46,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
 
 
 
-wxColour wxSystemSettings::GetSystemColour(int WXUNUSED(index))
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
 {
-    // FIXME_MGL
+    // overridden by wxSystemSettings::GetColour in wxUniversal
     return wxColour(0,0,0);
 }
 
-wxFont wxSystemSettings::GetSystemFont(int index)
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
     switch (index)
     {
@@ -69,18 +68,21 @@ wxFont wxSystemSettings::GetSystemFont(int index)
         case wxSYS_DEFAULT_GUI_FONT:
         {
             if ( !gs_fontDefault )
-                gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, FALSE, "Arial");
+                gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial");
             return *gs_fontDefault;
         }
         default:
-            return wxNullFont;
+        {
+        }
     }
+
+    return wxNullFont;
 }
 
-int wxSystemSettings::GetSystemMetric(int index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
 {
     int val;
-    
+
     switch (index)
     {
         case wxSYS_SCREEN_X:
@@ -91,23 +93,27 @@ int wxSystemSettings::GetSystemMetric(int index)
             return val;
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:
-            return 15; 
-            break;
+            return 15;
         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)
     {
-        case wxSYS_CAN_ICONIZE_FRAME: 
-            return FALSE; break;
+        case wxSYS_CAN_ICONIZE_FRAME:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return FALSE; break;
+        case wxSYS_TABLET_PRESENT:
+            return false;
+
         default:
-            return FALSE;
+            wxFAIL_MSG( _T("unknown feature") );
     }
+
+    return false;
 }