]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/settings.cpp
code cleanup
[wxWidgets.git] / src / os2 / settings.cpp
index b2c3b1c7f3fb4a4af8aecf4f017fab589dc9d66a..6bad06933b03d47e22ef271531c56d9982753d2f 100644 (file)
@@ -20,6 +20,7 @@
 #include "wx/gdicmn.h"
 #endif
 
+#include "wx/module.h"
 #include "wx/settings.h"
 #include "wx/window.h"
 #include "wx/os2/private.h"
@@ -71,8 +72,8 @@ void wxSystemSettingsModule::OnExit()
     delete gs_fontDefault;
 }
 
-wxColour wxSystemSettings::GetSystemColour(
-  int                               nIndex
+wxColour wxSystemSettingsNative::GetColour(
+  wxSystemColour                    nIndex
 )
 {
     COLORREF                        vRef;
@@ -148,13 +149,23 @@ 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
         //
         case wxSYS_COLOUR_LISTBOX:
         case wxSYS_COLOUR_CAPTIONTEXT:
             return(*wxWHITE);
-            break;
 
         case wxSYS_COLOUR_WINDOWTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
@@ -199,9 +210,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)
@@ -235,187 +248,66 @@ wxFont wxSystemSettings::GetSystemFont(int index)
 }
 
 // Get a system metric, e.g. scrollbar size
-int wxSystemSettings::GetSystemMetric(int index)
+int wxSystemSettingsNative::GetMetric( wxSystemMetric index,
+                                       wxWindow*      WXUNUSED(win) )
 {
     switch ( index)
     {
-        case wxSYS_MOUSE_BUTTONS:
-            // TODO
-            return 0;
-        case wxSYS_BORDER_X:
-            // TODO
-            return 0;
-        case wxSYS_BORDER_Y:
-            // TODO
-            return 0;
-        case wxSYS_CURSOR_X:
-            // TODO
-            return 0;
-        case wxSYS_CURSOR_Y:
-            // TODO
-            return 0;
-        case wxSYS_DCLICK_X:
-            // TODO
-            return 0;
-        case wxSYS_DCLICK_Y:
-            // TODO
-            return 0;
-        case wxSYS_DRAG_X:
-            // TODO
-            return 0;
-        case wxSYS_DRAG_Y:
-            // TODO
-            return 0;
-        case wxSYS_EDGE_X:
-            // TODO
-            return 0;
-        case wxSYS_EDGE_Y:
-            // TODO
-            return 0;
-        case wxSYS_HSCROLL_ARROW_X:
-            // TODO
-            return 0;
-        case wxSYS_HSCROLL_ARROW_Y:
-            // TODO
-            return 0;
-        case wxSYS_HTHUMB_X:
-            // TODO
-            return 0;
-        case wxSYS_ICON_X:
-            // TODO
-            return 0;
-        case wxSYS_ICON_Y:
-            // TODO
-            return 0;
-        case wxSYS_ICONSPACING_X:
-            // TODO
-            return 0;
-        case wxSYS_ICONSPACING_Y:
-            // TODO
-            return 0;
-        case wxSYS_WINDOWMIN_X:
-            // TODO
-            return 0;
-        case wxSYS_WINDOWMIN_Y:
-            // TODO
-            return 0;
+        // TODO case wxSYS_MOUSE_BUTTONS:
+        // TODO case wxSYS_BORDER_X:
+        // TODO case wxSYS_BORDER_Y:
+        // TODO case wxSYS_CURSOR_X:
+        // TODO case wxSYS_CURSOR_Y:
+        // TODO case wxSYS_DCLICK_X:
+        // TODO case wxSYS_DCLICK_Y:
+        // TODO case wxSYS_DRAG_X:
+        // TODO case wxSYS_DRAG_Y:
+        // TODO case wxSYS_EDGE_X:
+        // TODO case wxSYS_EDGE_Y:
+        // TODO case wxSYS_HSCROLL_ARROW_X:
+        // TODO case wxSYS_HSCROLL_ARROW_Y:
+        // TODO case wxSYS_HTHUMB_X:
+        // TODO case wxSYS_ICON_X:
+        // TODO case wxSYS_ICON_Y:
+        // TODO case wxSYS_ICONSPACING_X:
+        // TODO case wxSYS_ICONSPACING_Y:
+        // TODO case wxSYS_WINDOWMIN_X:
+        // TODO case wxSYS_WINDOWMIN_Y:
+
         case wxSYS_SCREEN_X:
-            // TODO
-            return 0;
+            return ::WinQuerySysValue(HWND_DESKTOP,SV_CXSCREEN);
         case wxSYS_SCREEN_Y:
-            // TODO
-            return 0;
-        case wxSYS_FRAMESIZE_X:
-            // TODO
-            return 0;
-        case wxSYS_FRAMESIZE_Y:
-            // TODO
-            return 0;
-        case wxSYS_SMALLICON_X:
-            // TODO
-            return 0;
-        case wxSYS_SMALLICON_Y:
-            // TODO
-            return 0;
-        case wxSYS_HSCROLL_Y:
-            // TODO
-            return 0;
-        case wxSYS_VSCROLL_X:
-            // TODO
-            return 0;
-        case wxSYS_VSCROLL_ARROW_X:
-            // TODO
-            return 0;
-        case wxSYS_VSCROLL_ARROW_Y:
-            // TODO
-            return 0;
-        case wxSYS_VTHUMB_Y:
-            // TODO
-            return 0;
-        case wxSYS_CAPTION_Y:
-            // TODO
-            return 0;
-        case wxSYS_MENU_Y:
-            // TODO
-            return 0;
-        case wxSYS_NETWORK_PRESENT:
-            // TODO
-            return 0;
-        case wxSYS_PENWINDOWS_PRESENT:
-            // TODO
-            return 0;
-        case wxSYS_SHOW_SOUNDS:
-            // TODO
-            return 0;
-        case wxSYS_SWAP_BUTTONS:
-            // TODO
-            return 0;
-        default:
-            return 0;
+            return ::WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN);
+
+        // TODO case wxSYS_FRAMESIZE_X:
+        // TODO case wxSYS_FRAMESIZE_Y:
+        // TODO case wxSYS_SMALLICON_X:
+        // TODO case wxSYS_SMALLICON_Y:
+        // TODO case wxSYS_HSCROLL_Y:
+        // TODO case wxSYS_VSCROLL_X:
+        // TODO case wxSYS_VSCROLL_ARROW_X:
+        // TODO case wxSYS_VSCROLL_ARROW_Y:
+        // TODO case wxSYS_VTHUMB_Y:
+        // TODO case wxSYS_CAPTION_Y:
+        // TODO case wxSYS_MENU_Y:
+        // TODO case wxSYS_NETWORK_PRESENT:
+        // TODO case wxSYS_PENWINDOWS_PRESENT:
+        // TODO case wxSYS_SHOW_SOUNDS:
+        // TODO case wxSYS_SWAP_BUTTONS:
     }
-    return 0;
+    return -1;  // unsupported metric
 }
 
-// Option functions (arbitrary name/value mapping)
-void wxSystemSettings::SetOption(
-  const wxString&                   rsName
-, const wxString&                   rsValue
-)
+bool wxSystemSettingsNative::HasFeature( wxSystemFeature index )
 {
-    int                             nIdx = wxSystemSettingsModule::sm_optionNames.Index( rsName
-                                                                                        ,FALSE
-                                                                                       );
-
-    if (nIdx == wxNOT_FOUND)
-    {
-        wxSystemSettingsModule::sm_optionNames.Add(rsName);
-        wxSystemSettingsModule::sm_optionValues.Add(rsValue);
-    }
-    else
+    switch (index)
     {
-        wxSystemSettingsModule::sm_optionNames[nIdx] = rsName;
-        wxSystemSettingsModule::sm_optionValues[nIdx] = rsValue;
-    }
-}
-
-void wxSystemSettings::SetOption(
-  const wxString&                   rsName
-, int                               nValue
-)
-{
-    wxString                        sValStr;
-
-    sValStr.Printf(wxT("%d"), nValue);
-    SetOption( rsName
-              ,sValStr
-             );
-} // end of
-
-wxString wxSystemSettings::GetOption(
-  const wxString&                   rsName
-)
-{
-    int                             nIdx = wxSystemSettingsModule::sm_optionNames.Index( rsName
-                                                                                        ,FALSE
-                                                                                       );
-
-    if (nIdx == wxNOT_FOUND)
-        return wxEmptyString;
-    else
-        return wxSystemSettingsModule::sm_optionValues[nIdx];
-} // end of
-
-int wxSystemSettings::GetOptionInt(
-  const wxString&                   rsName
-)
-{
-    return wxAtoi(GetOption(rsName));
-} // end of
+        case wxSYS_CAN_ICONIZE_FRAME:
+            return true;
 
-bool wxSystemSettings::HasOption(
-  const wxString&                   rsName
-)
-{
-    return (wxSystemSettingsModule::sm_optionNames.Index(rsName, FALSE) != wxNOT_FOUND);
-} // end of wxSystemSettings::HasOption
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return false;
+    }
 
+    return false;
+}