X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d451c5bd117cd7e7dcf3f1516049141093e46f0..c3e433b15929171af57df3c9c3c63d6ab8aa720b:/src/os2/settings.cpp diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp index 5918387a3f..b384ebb034 100644 --- a/src/os2/settings.cpp +++ b/src/os2/settings.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: settings.cpp +// Name: src/os2/settings.cpp // Purpose: wxSettings // Author: David Webster // Modified by: @@ -13,16 +13,17 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include -#include "wx/defs.h" -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/gdicmn.h" + #include + #include "wx/pen.h" + #include "wx/brush.h" + #include "wx/gdicmn.h" + #include "wx/window.h" + #include "wx/settings.h" + #include "wx/module.h" #endif -#include "wx/module.h" -#include "wx/settings.h" -#include "wx/window.h" +#include "wx/fontutil.h" + #include "wx/os2/private.h" // the module which is used to clean up wxSystemSettings data (this is a @@ -62,7 +63,7 @@ wxArrayString wxSystemSettingsModule::sm_optionValues; bool wxSystemSettingsModule::OnInit() { - return TRUE; + return true; } void wxSystemSettingsModule::OnExit() @@ -70,6 +71,7 @@ void wxSystemSettingsModule::OnExit() sm_optionNames.Clear(); sm_optionValues.Clear(); delete gs_fontDefault; + gs_fontDefault = NULL; } wxColour wxSystemSettingsNative::GetColour( @@ -78,180 +80,191 @@ wxColour wxSystemSettingsNative::GetColour( { COLORREF vRef; wxColour vCol; + LONG vSysClr; switch (nIndex) { // // PM actually has values for these // case wxSYS_COLOUR_WINDOW: - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_WINDOW - ,0L - ); - vCol.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); + vSysClr = SYSCLR_WINDOW; break; case wxSYS_COLOUR_WINDOWFRAME: - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_WINDOWFRAME - ,0L - ); - vCol.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); + vSysClr = SYSCLR_WINDOWFRAME; break; case wxSYS_COLOUR_MENUTEXT: - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENUTEXT - ,0L - ); - vCol.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); + vSysClr = SYSCLR_MENUTEXT; + break; + + case wxSYS_COLOUR_MENUHILIGHT: + vSysClr = SYSCLR_MENUHILITE; break; case wxSYS_COLOUR_BTNFACE: - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_BUTTONDEFAULT - ,0L - ); - vCol.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); + vSysClr = SYSCLR_BUTTONMIDDLE; break; case wxSYS_COLOUR_BTNSHADOW: - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_BUTTONMIDDLE - ,0L - ); - vCol.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); + vSysClr = SYSCLR_BUTTONDARK; break; case wxSYS_COLOUR_BTNHIGHLIGHT: - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_BUTTONLIGHT - ,0L - ); - vCol.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); + vSysClr = SYSCLR_BUTTONLIGHT; + break; + + case wxSYS_COLOUR_BACKGROUND: + vSysClr = SYSCLR_BACKGROUND; + break; + + case wxSYS_COLOUR_APPWORKSPACE: + vSysClr = SYSCLR_APPWORKSPACE; break; case wxSYS_COLOUR_MENUBAR: - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENU - ,0L - ); - vCol.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); + case wxSYS_COLOUR_MENU: + vSysClr = SYSCLR_MENU; + break; + + case wxSYS_COLOUR_INACTIVECAPTION: + vSysClr = SYSCLR_INACTIVETITLE; + break; + + case wxSYS_COLOUR_INACTIVEBORDER: + vSysClr = SYSCLR_INACTIVEBORDER; break; - // - // We'll have to just give values to these - // case wxSYS_COLOUR_LISTBOX: + vSysClr = SYSCLR_ENTRYFIELD; + break; + case wxSYS_COLOUR_CAPTIONTEXT: - return(*wxWHITE); + vSysClr = SYSCLR_TITLETEXT; break; - case wxSYS_COLOUR_WINDOWTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT: + vSysClr = SYSCLR_INACTIVETITLETEXT; + break; + + case wxSYS_COLOUR_WINDOWTEXT: case wxSYS_COLOUR_BTNTEXT: - case wxSYS_COLOUR_INFOTEXT: - vCol = (*wxBLACK); + vSysClr = SYSCLR_WINDOWTEXT; break; - // - // We should customize these to look like other ports - // + case wxSYS_COLOUR_INFOTEXT: + vSysClr = SYSCLR_HELPTEXT; + break; case wxSYS_COLOUR_ACTIVECAPTION: + vSysClr = SYSCLR_ACTIVETITLE; + break; + case wxSYS_COLOUR_ACTIVEBORDER: + vSysClr = SYSCLR_ACTIVEBORDER; + break; + case wxSYS_COLOUR_HIGHLIGHT: - vCol = (*wxBLUE); + vSysClr = SYSCLR_HILITEBACKGROUND; break; case wxSYS_COLOUR_SCROLLBAR: - case wxSYS_COLOUR_BACKGROUND: - case wxSYS_COLOUR_INACTIVECAPTION: - case wxSYS_COLOUR_MENU: - case wxSYS_COLOUR_INACTIVEBORDER: - case wxSYS_COLOUR_APPWORKSPACE: + vSysClr = SYSCLR_SCROLLBAR; + break; + case wxSYS_COLOUR_HIGHLIGHTTEXT: + vSysClr = SYSCLR_HILITEFOREGROUND; + break; + + case wxSYS_COLOUR_INFOBK: + vSysClr = SYSCLR_HELPBACKGROUND; + break; + + // Don't know what these should be, so leave them grey (normally) case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_3DDKSHADOW: case wxSYS_COLOUR_3DLIGHT: - case wxSYS_COLOUR_INFOBK: - vCol = (*wxLIGHT_GREY); + case wxSYS_COLOUR_HOTLIGHT: + case wxSYS_COLOUR_GRADIENTACTIVECAPTION: + case wxSYS_COLOUR_GRADIENTINACTIVECAPTION: + vSysClr = SYSCLR_BUTTONMIDDLE; break; default: - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_WINDOW - ,0L - ); - vCol.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); + vSysClr = SYSCLR_WINDOW; break; } + vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP, + vSysClr, + 0L ); + vCol.Set( GetRValue(vRef), + GetGValue(vRef), + GetBValue(vRef) ); return(vCol); } // end of wxSystemSettingsNative::GetColour +// ---------------------------------------------------------------------------- +// fonts +// ---------------------------------------------------------------------------- + wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) { - // TODO + const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT; + if ( isDefaultRequested ) + { + if ( gs_fontDefault ) + return *gs_fontDefault; + } + + wxFont font; + // FIXME: The mapping could be improved and also OS/2 system fonts + // should be taken into account e.g. by using PrfQueryProfileString + // to look for PM_System_Fonts in HINI_USERPROFILE. + // FIXME2: Creating a font from the native font info does not + // seem to work properly. switch (index) { - case wxSYS_DEVICE_DEFAULT_FONT: - { - break; - } - case wxSYS_DEFAULT_PALETTE: - { - break; - } case wxSYS_SYSTEM_FIXED_FONT: - { - break; - } + case wxSYS_OEM_FIXED_FONT: + case wxSYS_ANSI_FIXED_FONT: + font.Create( 10, + wxFONTFAMILY_TELETYPE, + wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL ); + break; + case wxSYS_ANSI_VAR_FONT: + font.Create( 10, + wxFONTFAMILY_MODERN, + wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL ); + break; case wxSYS_SYSTEM_FONT: - { - break; - } - default: case wxSYS_DEFAULT_GUI_FONT: - { - break; - } + font.Create( 10, + wxFONTFAMILY_SWISS, + wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL ); + break; + default: + wxFAIL_MSG( _T("stock font not found") ); + return GetFont(wxSYS_ANSI_VAR_FONT); } - if(wxSWISS_FONT) - return *wxSWISS_FONT; - return wxNullFont; + + if ( isDefaultRequested ) + { + // if we got here it means we hadn't cached it yet - do now + gs_fontDefault = new wxFont(font); + } + + return font; } // Get a system metric, e.g. scrollbar size -int wxSystemSettingsNative::GetMetric( - wxSystemMetric index -) +int wxSystemSettingsNative::GetMetric( wxSystemMetric index, + wxWindow* WXUNUSED(win) ) { switch ( index) { @@ -275,18 +288,22 @@ int wxSystemSettingsNative::GetMetric( // TODO case wxSYS_ICONSPACING_Y: // TODO case wxSYS_WINDOWMIN_X: // TODO case wxSYS_WINDOWMIN_Y: - + case wxSYS_SCREEN_X: return ::WinQuerySysValue(HWND_DESKTOP,SV_CXSCREEN); case wxSYS_SCREEN_Y: 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: + + case wxSYS_HSCROLL_Y: + return ::WinQuerySysValue(HWND_DESKTOP,SV_CYHSCROLL); + case wxSYS_VSCROLL_X: + return ::WinQuerySysValue(HWND_DESKTOP,SV_CXVSCROLL); + // TODO case wxSYS_VSCROLL_ARROW_X: // TODO case wxSYS_VSCROLL_ARROW_Y: // TODO case wxSYS_VTHUMB_Y: @@ -296,27 +313,26 @@ int wxSystemSettingsNative::GetMetric( // TODO case wxSYS_PENWINDOWS_PRESENT: // TODO case wxSYS_SHOW_SOUNDS: // TODO case wxSYS_SWAP_BUTTONS: - + default: - return -1; // unsupported metric + break; } - return 0; + return -1; // unsupported metric } -bool wxSystemSettingsNative::HasFeature( - wxSystemFeature index -) +bool wxSystemSettingsNative::HasFeature( wxSystemFeature index ) { switch (index) { case wxSYS_CAN_ICONIZE_FRAME: - return TRUE; + return true; - case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - return FALSE; + // TODO case wxSYS_CAN_DRAW_FRAME_DECORATIONS: + // TODO case wxSYS_TABLET_PRESENT: default: - return FALSE; + break; } - return FALSE; + + return false; }