X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f89dbc48e4ffdec4ea55b5444c6df87df2d642d..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/settings.h?ds=inline diff --git a/include/wx/settings.h b/include/wx/settings.h index 1a52f5d711..8b467f51ce 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/settings.h -// Purpose: wxSystemSettingsBase class +// Purpose: wxSystemSettings class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SETTINGS_H_BASE_ @@ -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 @@ -39,6 +44,7 @@ enum wxSystemColour { wxSYS_COLOUR_SCROLLBAR, wxSYS_COLOUR_BACKGROUND, + wxSYS_COLOUR_DESKTOP = wxSYS_COLOUR_BACKGROUND, wxSYS_COLOUR_ACTIVECAPTION, wxSYS_COLOUR_INACTIVECAPTION, wxSYS_COLOUR_MENU, @@ -53,26 +59,34 @@ enum wxSystemColour wxSYS_COLOUR_HIGHLIGHT, wxSYS_COLOUR_HIGHLIGHTTEXT, wxSYS_COLOUR_BTNFACE, + wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE, wxSYS_COLOUR_BTNSHADOW, + wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW, wxSYS_COLOUR_GRAYTEXT, wxSYS_COLOUR_BTNTEXT, wxSYS_COLOUR_INACTIVECAPTIONTEXT, wxSYS_COLOUR_BTNHIGHLIGHT, + wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, + wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, + wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, wxSYS_COLOUR_3DDKSHADOW, wxSYS_COLOUR_3DLIGHT, wxSYS_COLOUR_INFOTEXT, wxSYS_COLOUR_INFOBK, wxSYS_COLOUR_LISTBOX, + wxSYS_COLOUR_HOTLIGHT, + wxSYS_COLOUR_GRADIENTACTIVECAPTION, + wxSYS_COLOUR_GRADIENTINACTIVECAPTION, + wxSYS_COLOUR_MENUHILIGHT, + wxSYS_COLOUR_MENUBAR, - wxSYS_COLOUR_DESKTOP = wxSYS_COLOUR_BACKGROUND, - wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE, - wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW, - wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, - wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, - wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT + 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 enum wxSystemMetric { wxSYS_MOUSE_BUTTONS = 1, @@ -118,11 +132,23 @@ enum wxSystemMetric 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 wxSystemScreenType +{ + wxSYS_SCREEN_NONE = 0, // not yet defined + + wxSYS_SCREEN_TINY, // < + wxSYS_SCREEN_PDA, // >= 320x240 + wxSYS_SCREEN_SMALL, // >= 640x480 + wxSYS_SCREEN_DESKTOP // >= 800x600 }; // ---------------------------------------------------------------------------- -// wxSystemSettingsBase: defines the API for wxSystemSettings class +// wxSystemSettingsNative: defines the API for wxSystemSettings class // ---------------------------------------------------------------------------- // this is a namespace rather than a class: it has only non virtual static @@ -132,8 +158,7 @@ enum wxSystemFeature // files (i.e. this is not a real base class as we can't override its virtual // functions because it doesn't have any) -#if 0 -class WXDLLEXPORT wxSystemSettingsBase +class WXDLLEXPORT wxSystemSettingsNative { public: // get a standard system colour @@ -143,42 +168,37 @@ 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); - - - // the backwards compatible versions, 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); } - static bool GetCapability(int index) - { return HasFeature((wxSystemFeature)index); } }; -#endif // ---------------------------------------------------------------------------- // include the declaration of the real platform-dependent class // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) - #include "wx/msw/settings.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/settings.h" -#elif defined(__WXGTK__) - #include "wx/gtk/settings.h" -#elif defined(__WXMGL__) - #include "wx/mgl/settings.h" -#elif defined(__WXMAC__) - #include "wx/mac/settings.h" -#elif defined(__WXPM__) - #include "wx/os2/settings.h" -#endif +class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative +{ +public: +#ifdef __WXUNIVERSAL__ + // in wxUniversal we want to use the theme standard colours instead of the + // system ones, otherwise wxSystemSettings is just the same as + // wxSystemSettingsNative + 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; + +}; #endif // _WX_SETTINGS_H_BASE_