X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a2076a2f8ff930b2d8df4d32218ec20dffe9d7f..5a410e4453e28ee77ee3ad7a407ca71692f9f30f:/src/os2/settings.cpp?ds=inline diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp index 6745891e57..b34ca6d079 100644 --- 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) { @@ -301,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; @@ -357,13 +370,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; }