X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca06ee0df7598b07b9150a8d478a235b6fff4755..bfdaa9173ed5b20dd5a9cd83241ce44fc0eff960:/src/common/settcmn.cpp diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp index d8d68f8de0..c9c011d5f7 100644 --- a/src/common/settcmn.cpp +++ b/src/common/settcmn.cpp @@ -1,9 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/settcmn.cpp +// Name: src/common/settcmn.cpp // Purpose: common (to all ports) wxWindow functions // Author: Robert Roebling -// RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,10 +14,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 +21,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 +44,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 +61,8 @@ wxSystemScreenType wxSystemSettings::GetScreenType() return ms_screen; } - + void wxSystemSettings::SetScreenType( wxSystemScreenType screen ) { ms_screen = screen; } -