GetOsVersion() is now wxGUIAppTraits method instead of a global function

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index 6745891e57f70ab7af975b9f849018a8162aca2b..47b35142a9bb2409117976b6901b9dbef01adadf 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -18,9 +18,9 @@
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/gdicmn.h"
-#include "wx/module.h"
 #endif
 
+#include "wx/module.h"
 #include "wx/settings.h"
 #include "wx/window.h"
 #include "wx/os2/private.h"
@@ -72,8 +72,8 @@ void wxSystemSettingsModule::OnExit()
     delete gs_fontDefault;
 }
 
-wxColour wxSystemSettings::GetSystemColour(
-  int                               nIndex
+wxColour wxSystemSettingsNative::GetColour(
+  wxSystemColour                    nIndex
 )
 {
     COLORREF                        vRef;
@@ -149,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
         //
@@ -200,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)
@@ -236,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)
     {
@@ -357,13 +372,18 @@ int wxSystemSettings::GetSystemMetric(int index)
     return 0;
 }
 
-bool wxSystemSettings::GetCapability(int index)
+bool wxSystemSettingsNative::HasFeature(
+  wxSystemFeature                   index
+)
 {
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
+            return TRUE;
+
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return TRUE; break;
+            return FALSE;
+
         default:
             return FALSE;
     }