Warning fix.

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index b99f6e5ee5eefb7686157f60d193e2c62c6ca5a2..465cf23591c3d4a5bb8e2ef58cd26e2cdbb9e31a 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -1,19 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        settings.h
-// Author:      Vaclav Slavik
+// Name:        src/mgl/settings.cpp
+// Author:      Vaclav Slavik, Robert Roebling

 // Id:          $Id$
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "settings.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #include "wx/settings.h"
 #include "wx/colour.h"
 #include "wx/font.h"
 #endif
 
 #include "wx/settings.h"
 #include "wx/colour.h"
 #include "wx/font.h"

+#include "wx/gdicmn.h"

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


@@ -25,7 +28,7 @@ static wxFont *gs_fontDefault = NULL;
 class wxSystemSettingsModule : public wxModule
 {
 public:
 class wxSystemSettingsModule : public wxModule
 {
 public:

-    virtual bool OnInit() { return TRUE; }
+    virtual bool OnInit() { return true; }

     virtual void OnExit()
     {
         delete gs_fontDefault;
     virtual void OnExit()
     {
         delete gs_fontDefault;


@@ -40,48 +43,74 @@ 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)

 {
 {

-    bool isDefaultRequested = (index == wxSYS_DEFAULT_GUI_FONT);
-
-    if ( isDefaultRequested && gs_fontDefault )
+    switch (index)

     {
     {

-        return *gs_fontDefault;
+        case wxSYS_OEM_FIXED_FONT:
+        case wxSYS_ANSI_FIXED_FONT:
+        case wxSYS_SYSTEM_FIXED_FONT:
+        {
+            return *wxNORMAL_FONT;
+        }
+        case wxSYS_ANSI_VAR_FONT:
+        case wxSYS_SYSTEM_FONT:
+        case wxSYS_DEVICE_DEFAULT_FONT:
+        case wxSYS_DEFAULT_GUI_FONT:
+        {
+            if ( !gs_fontDefault )
+                gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial");
+            return *gs_fontDefault;
+        }
+        default:
+        {
+        }

     }
 
     }
 

-    // FIXME_MGL
-    wxFont font(10, wxSWISS, wxNORMAL, wxNORMAL, FALSE, "Arial");
+    return wxNullFont;
+}
+
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
+{
+    int val;

 
 

-    if ( isDefaultRequested )
+    switch (index)

     {
     {

-        // if we got here it means we hadn't cached it yet - do now
-        gs_fontDefault = new wxFont(font);
+        case wxSYS_SCREEN_X:
+            wxDisplaySize(&val, NULL);
+            return val;
+        case wxSYS_SCREEN_Y:
+            wxDisplaySize(NULL, &val);
+            return val;
+        case wxSYS_VSCROLL_X:
+        case wxSYS_HSCROLL_Y:
+            return 15;
+        default:
+        {
+        }

     }
 
     }
 

-    return font;
-}
-
-int wxSystemSettings::GetSystemMetric(int WXUNUSED(index))
-{
-    // FIXME_MGL
-    return 1;
+    return -1;  // unsupported metric

 }
 
 }
 

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

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

-        case wxSYS_CAN_ICONIZE_FRAME: 
-            return FALSE; break;
+        case wxSYS_CAN_ICONIZE_FRAME:
+            return false;

         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return FALSE; break;
+            return false;

         default:
         default:

-            return FALSE;
+        {
+        }

     }
     }

+
+    return false;

 }
 }