X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c15521c67eb8aba1994240262ba973aa11ef0086..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/settings.h diff --git a/include/wx/settings.h b/include/wx/settings.h index 14d4e5fa3f..3fe46534e0 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 ///////////////////////////////////////////////////////////////////////////// @@ -15,6 +15,8 @@ #include "wx/colour.h" #include "wx/font.h" +class WXDLLIMPEXP_FWD_CORE wxWindow; + // possible values for wxSystemSettings::GetFont() parameter // // NB: wxMSW assumes that they have the same values as the parameters of @@ -28,7 +30,10 @@ enum wxSystemFont wxSYS_DEVICE_DEFAULT_FONT, wxSYS_DEFAULT_PALETTE, wxSYS_SYSTEM_FIXED_FONT, - wxSYS_DEFAULT_GUI_FONT + wxSYS_DEFAULT_GUI_FONT, + + // this was just a temporary aberration, do not use it any more + wxSYS_ICONTITLE_FONT = wxSYS_DEFAULT_GUI_FONT }; // possible values for wxSystemSettings::GetColour() parameter @@ -74,11 +79,12 @@ enum wxSystemColour wxSYS_COLOUR_GRADIENTINACTIVECAPTION, wxSYS_COLOUR_MENUHILIGHT, wxSYS_COLOUR_MENUBAR, + wxSYS_COLOUR_LISTBOXTEXT, wxSYS_COLOUR_MAX }; -// possible values for wxSystemSettings::GetMetric() parameter +// possible values for wxSystemSettings::GetMetric() index parameter // // NB: update the conversion table in msw/settings.cpp if you change the values // of the elements of this enum @@ -120,24 +126,27 @@ enum wxSystemMetric wxSYS_NETWORK_PRESENT, wxSYS_PENWINDOWS_PRESENT, wxSYS_SHOW_SOUNDS, - wxSYS_SWAP_BUTTONS + wxSYS_SWAP_BUTTONS, + wxSYS_DCLICK_MSEC }; // possible values for wxSystemSettings::HasFeature() parameter enum wxSystemFeature { wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1, - wxSYS_CAN_ICONIZE_FRAME + wxSYS_CAN_ICONIZE_FRAME, + wxSYS_TABLET_PRESENT }; // 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 }; // ---------------------------------------------------------------------------- @@ -151,7 +160,7 @@ enum wxSystemScreen // files (i.e. this is not a real base class as we can't override its virtual // functions because it doesn't have any) -class WXDLLEXPORT wxSystemSettingsNative +class WXDLLIMPEXP_CORE wxSystemSettingsNative { public: // get a standard system colour @@ -161,7 +170,7 @@ public: static wxFont GetFont(wxSystemFont index); // get a system-dependent metric - static int GetMetric(wxSystemMetric index); + static int GetMetric(wxSystemMetric index, wxWindow * win = NULL); // return true if the port has certain feature static bool HasFeature(wxSystemFeature index); @@ -171,35 +180,30 @@ public: // include the declaration of the real platform-dependent class // ---------------------------------------------------------------------------- -class wxSystemSettings : public wxSystemSettingsNative +class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative { public: #ifdef __WXUNIVERSAL__ // in wxUniversal we want to use the theme standard colours instead of the - // system ones, otherwuse wxSystemSettings is just the same as + // system ones, otherwise wxSystemSettings is just the same as // wxSystemSettingsNative static wxColour GetColour(wxSystemColour index); + + // some metrics are toolkit-dependent and provided by wxUniv, some are + // lowlevel + static int GetMetric(wxSystemMetric index, wxWindow *win = NULL); #endif // __WXUNIVERSAL__ // 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 ); - - // Value - static wxSystemScreen ms_screen; + 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! - static wxColour GetSystemColour(int index) - { return GetColour((wxSystemColour)index); } - static wxFont GetSystemFont(int index) - { return GetFont((wxSystemFont)index); } - static int GetSystemMetric(int index) - { return GetMetric((wxSystemMetric)index); } }; #endif