X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c15521c67eb8aba1994240262ba973aa11ef0086..af99040c70b975e24ac0acee50f1fa13746d1239:/include/wx/settings.h diff --git a/include/wx/settings.h b/include/wx/settings.h index 14d4e5fa3f..168db483f2 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -131,13 +131,14 @@ enum wxSystemFeature }; // values for different screen designs -enum wxSystemScreen +enum wxSystemScreenType { wxSYS_SCREEN_NONE = 0, // not yet defined - wxSYS_SCREEN_DESKTOP, // >= 800x600 - wxSYS_SCREEN_SMALL, // >= 640x480 + + wxSYS_SCREEN_TINY, // < wxSYS_SCREEN_PDA, // >= 320x240 - wxSYS_SCREEN_TINY // < + wxSYS_SCREEN_SMALL, // >= 640x480 + wxSYS_SCREEN_DESKTOP // >= 800x600 }; // ---------------------------------------------------------------------------- @@ -171,7 +172,7 @@ public: // include the declaration of the real platform-dependent class // ---------------------------------------------------------------------------- -class wxSystemSettings : public wxSystemSettingsNative +class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative { public: #ifdef __WXUNIVERSAL__ @@ -183,13 +184,13 @@ public: // Get system screen design (desktop, pda, ..) used for // laying out various dialogs. - static wxSystemScreen GetScreen(); - + static wxSystemScreenType GetScreenType(); + // Override default. - static void SetScreen( wxSystemScreen screen ); - + static void SetScreenType( wxSystemScreenType screen ); + // Value - static wxSystemScreen ms_screen; + static wxSystemScreenType ms_screen; // the backwards compatible versions of wxSystemSettingsNative functions,