X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..97e49559fb0e1dfc43d66e8784ec47182f5507e9:/src/common/settcmn.cpp?ds=inline diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp index 9ca1565a15..4c99c292a1 100644 --- a/src/common/settcmn.cpp +++ b/src/common/settcmn.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/settcmn.cpp +// Name: src/common/settcmn.cpp // Purpose: common (to all ports) wxWindow functions // Author: Robert Roebling // RCS-ID: $Id$ // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -15,10 +15,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "settings.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -26,10 +22,10 @@ #pragma hdrstop #endif +#include "wx/settings.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/utils.h" - #include "wx/settings.h" #endif //WX_PRECOMP // ---------------------------------------------------------------------------- @@ -49,16 +45,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 +62,8 @@ wxSystemScreenType wxSystemSettings::GetScreenType() return ms_screen; } - + void wxSystemSettings::SetScreenType( wxSystemScreenType screen ) { ms_screen = screen; } -