X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e99520bd3fc092bbbcbc38bb699a0236618ea40..72bfca58d997c6f54e92aabc108c1cc18674bbee:/src/os2/settings.cpp

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index f7394528e1..b34ca6d079 100644
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -20,12 +20,60 @@
 #include "wx/gdicmn.h"
 #endif
 
+#include "wx/module.h"
 #include "wx/settings.h"
 #include "wx/window.h"
 #include "wx/os2/private.h"
 
-wxColour wxSystemSettings::GetSystemColour(
-  int                               nIndex
+// the module which is used to clean up wxSystemSettings data (this is a
+// singleton class so it can't be done in the dtor)
+class wxSystemSettingsModule : public wxModule
+{
+    friend class wxSystemSettings;
+public:
+    virtual bool OnInit();
+    virtual void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
+
+    static wxArrayString   sm_optionNames;
+    static wxArrayString   sm_optionValues;
+};
+
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+static wxFont *gs_fontDefault = NULL;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxSystemSettingsModule
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
+
+wxArrayString wxSystemSettingsModule::sm_optionNames;
+wxArrayString wxSystemSettingsModule::sm_optionValues;
+
+bool wxSystemSettingsModule::OnInit()
+{
+    return TRUE;
+}
+
+void wxSystemSettingsModule::OnExit()
+{
+    sm_optionNames.Clear();
+    sm_optionValues.Clear();
+    delete gs_fontDefault;
+}
+
+wxColour wxSystemSettingsNative::GetColour(
+  wxSystemColour                    nIndex
 )
 {
     COLORREF                        vRef;
@@ -101,6 +149,17 @@ wxColour wxSystemSettings::GetSystemColour(
                     );
             break;
 
+        case wxSYS_COLOUR_MENUBAR:
+            vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
+                                             ,SYSCLR_MENU
+                                             ,0L
+                                            );
+            vCol.Set( GetRValue(vRef)
+                     ,GetGValue(vRef)
+                     ,GetBValue(vRef)
+                    );
+            break;
+
         //
         // We'll have to just give values to these
         //
@@ -152,9 +211,11 @@ wxColour wxSystemSettings::GetSystemColour(
             break;
     }
     return(vCol);
-} // end of wxSystemSettings::GetSystemColour
+} // end of wxSystemSettingsNative::GetColour
 
-wxFont wxSystemSettings::GetSystemFont(int index)
+wxFont wxSystemSettingsNative::GetFont(
+  wxSystemFont                      index
+)
 {
     // TODO
     switch (index)
@@ -188,7 +249,9 @@ wxFont wxSystemSettings::GetSystemFont(int index)
 }
 
 // Get a system metric, e.g. scrollbar size
-int wxSystemSettings::GetSystemMetric(int index)
+int wxSystemSettingsNative::GetMetric(
+  wxSystemMetric                    index
+)
 {
     switch ( index)
     {
@@ -253,11 +316,9 @@ int wxSystemSettings::GetSystemMetric(int index)
             // TODO
             return 0;
         case wxSYS_SCREEN_X:
-            // TODO
-            return 0;
+            return ::WinQuerySysValue(HWND_DESKTOP,SV_CXSCREEN);
         case wxSYS_SCREEN_Y:
-            // TODO
-            return 0;
+            return ::WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN);
         case wxSYS_FRAMESIZE_X:
             // TODO
             return 0;
@@ -309,3 +370,20 @@ int wxSystemSettings::GetSystemMetric(int index)
     return 0;
 }
 
+bool wxSystemSettingsNative::HasFeature(
+  wxSystemFeature                   index
+)
+{
+    switch (index)
+    {
+        case wxSYS_CAN_ICONIZE_FRAME:
+            return TRUE;
+
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return FALSE;
+
+        default:
+            return FALSE;
+    }
+    return FALSE;
+}