compilation fix: test correctly for filter string not being empty in MakeUserDataRec

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index fab6801169e0c9a4aeb7a1148046f94cace1489d..93224a6c295b4a39777d213084a44708e6489362 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -1,34 +1,119 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        settings.h
-// Author:      Vaclav Slavik
+// 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
 /////////////////////////////////////////////////////////////////////////////
 
+// 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"
 
-wxColour wxSystemSettings::GetSystemColour(int WXUNUSED(index))
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+    #include "wx/font.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+static wxFont *gs_fontDefault = NULL;
+
+class wxSystemSettingsModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit()
+    {
+        delete gs_fontDefault;
+        gs_fontDefault = NULL;
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
+
+
+
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
 {
-    // FIXME_MGL
-    return wxColour(255,255,0);
+    // overridden by wxSystemSettings::GetColour in wxUniversal
+    return wxColour(0,0,0);
 }
 
-wxFont wxSystemSettings::GetSystemFont(int WXUNUSED(index))
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
-    // FIXME_MGL
-    return wxFont(12, wxMODERN, wxNORMAL, wxNORMAL);
+    switch (index)
+    {
+        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:
+        {
+        }
+    }
+
+    return wxNullFont;
 }
 
-int wxSystemSettings::GetSystemMetric(int WXUNUSED(index))
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
 {
-    // FIXME_MGL
-    return 1;
+    int val;
+
+    switch (index)
+    {
+        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 -1;  // unsupported metric
+}
+
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
+{
+    switch (index)
+    {
+        case wxSYS_CAN_ICONIZE_FRAME:
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+        case wxSYS_TABLET_PRESENT:
+            return false;
+
+        default:
+            wxFAIL_MSG( _T("unknown feature") );
+    }
+
+    return false;
 }