New code for Update() under GTK 2.0. Added

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index fab6801169e0c9a4aeb7a1148046f94cace1489d..355db0d4f6ba1cabe7031da87be68fcabfccf349 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        settings.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        settings.h

-// Author:      Vaclav Slavik
+// Author:      Vaclav Slavik, Robert Roebling

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


@@ -11,24 +11,104 @@
 #pragma implementation "settings.h"
 #endif
 
 #pragma implementation "settings.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #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"
+
+// ----------------------------------------------------------------------------
+// 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))
+{
+    // not implemented, the mean is in wxUniversal
+    return wxColour(0,0,0);
+}

 
 

-wxColour wxSystemSettings::GetSystemColour(int WXUNUSED(index))
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)

 {
 {

-    // FIXME_MGL
-    return wxColour(255,255,0);
+    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;
+    }

 }
 
 }
 

-wxFont wxSystemSettings::GetSystemFont(int WXUNUSED(index))
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index)

 {
 {

-    // FIXME_MGL
-    return wxFont(12, wxMODERN, wxNORMAL, wxNORMAL);
+    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; 
+            break;
+        default:
+            wxCHECK_MSG(index, 0, wxT("wxSystemSettings::GetMetric not fully implemented"));
+            return 0;
+    }

 }
 
 }
 

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

 {
 {

-    // FIXME_MGL
-    return 1;
+    switch (index)
+    {
+        case wxSYS_CAN_ICONIZE_FRAME: 
+            return FALSE; break;
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return FALSE; break;
+        default:
+            return FALSE;
+    }

 }
 }