Applied patch [ 869522 ] Cleaning of deprecated contrib

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index de9acf20c86fbff1ba491218931957cbabdc5462..b34ca6d079a305e783e408c1ebde4f9035dbfc50 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"
@@ -149,17 +149,6 @@ wxColour wxSystemSettingsNative::GetColour(
                     );
             break;
 
-        case wxSYS_COLOUR_BTNDARKSHADOW:
-            vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
-                                             ,SYSCLR_BUTTONDARK
-                                             ,0L
-                                            );
-            vCol.Set( GetRValue(vRef)
-                     ,GetGValue(vRef)
-                     ,GetBValue(vRef)
-                    );
-            break;
-
         case wxSYS_COLOUR_MENUBAR:
             vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
                                              ,SYSCLR_MENU
@@ -327,11 +316,9 @@ int wxSystemSettingsNative::GetMetric(
             // 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;