X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca06ee0df7598b07b9150a8d478a235b6fff4755..9cc62fc819e1b2b01af9732a3ad218aeec13e4d4:/src/common/settcmn.cpp diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp index d8d68f8de0..f5862ba7af 100644 --- a/src/common/settcmn.cpp +++ b/src/common/settcmn.cpp @@ -3,7 +3,7 @@ // Purpose: common (to all ports) wxWindow functions // Author: Robert Roebling // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -49,16 +49,16 @@ wxSystemScreenType wxSystemSettings::GetScreenType() int x = GetMetric( wxSYS_SCREEN_X ); ms_screen = wxSYS_SCREEN_DESKTOP; - + if (x < 800) ms_screen = wxSYS_SCREEN_SMALL; - + if (x < 640) ms_screen = wxSYS_SCREEN_PDA; - + if (x < 200) ms_screen = wxSYS_SCREEN_TINY; - + // This is probably a bug, but VNC seems to report 0 if (x < 10) ms_screen = wxSYS_SCREEN_DESKTOP; @@ -66,9 +66,27 @@ wxSystemScreenType wxSystemSettings::GetScreenType() return ms_screen; } - + void wxSystemSettings::SetScreenType( wxSystemScreenType screen ) { ms_screen = screen; } +#if WXWIN_COMPATIBILITY_2_4 + +wxColour wxSystemSettings::GetSystemColour(int index) +{ + return GetColour((wxSystemColour)index); +} + +wxFont wxSystemSettings::GetSystemFont(int index) +{ + return GetFont((wxSystemFont)index); +} + +int wxSystemSettings::GetSystemMetric(int index) +{ + return GetMetric((wxSystemMetric)index); +} + +#endif // WXWIN_COMPATIBILITY_2_4