X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fce8d2eeea6879644acec98e1244516eb053b78..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/settings.h?ds=sidebyside diff --git a/include/wx/settings.h b/include/wx/settings.h index cd3246ef3f..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 ///////////////////////////////////////////////////////////////////////////// @@ -130,12 +130,15 @@ enum wxSystemFeature wxSYS_CAN_ICONIZE_FRAME }; -// values for wxSystemSettings::GetString -enum wxSystemString +// values for different screen designs +enum wxSystemScreenType { - wxSYS_DECIMAL_SEPARATOR = 1, - wxSYS_LIST_SEPARATOR, - wxSYS_LEADING_ZERO + wxSYS_SCREEN_NONE = 0, // not yet defined + + wxSYS_SCREEN_TINY, // < + wxSYS_SCREEN_PDA, // >= 320x240 + wxSYS_SCREEN_SMALL, // >= 640x480 + wxSYS_SCREEN_DESKTOP // >= 800x600 }; // ---------------------------------------------------------------------------- @@ -163,19 +166,13 @@ public: // return true if the port has certain feature static bool HasFeature(wxSystemFeature index); - - // Windows-only for now -#ifdef __WXMSW__ - // Get a system string, e. g. decimal separator - static wxString GetString(int index); -#endif }; // ---------------------------------------------------------------------------- // include the declaration of the real platform-dependent class // ---------------------------------------------------------------------------- -class wxSystemSettings : public wxSystemSettingsNative +class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative { public: #ifdef __WXUNIVERSAL__ @@ -185,6 +182,16 @@ public: static wxColour GetColour(wxSystemColour index); #endif // __WXUNIVERSAL__ + // Get system screen design (desktop, pda, ..) used for + // laying out various dialogs. + static wxSystemScreenType GetScreenType(); + + // Override default. + static void SetScreenType( wxSystemScreenType screen ); + + // Value + static wxSystemScreenType ms_screen; + // the backwards compatible versions of wxSystemSettingsNative functions, // don't use these methods in the new code!