X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd6d5c94f8be7c9cd39290b8169cce295da4c25c..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/os2/settings.cpp diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp index b2c3b1c7f3..b34ca6d079 100644 --- a/src/os2/settings.cpp +++ b/src/os2/settings.cpp @@ -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,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 // @@ -199,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) @@ -235,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) { @@ -300,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; @@ -356,66 +370,20 @@ int wxSystemSettings::GetSystemMetric(int index) return 0; } -// 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; - } -} + case wxSYS_CAN_ICONIZE_FRAME: + return TRUE; -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 - -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; + default: + return FALSE; + } + return FALSE; +}