X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ddec9f1eeb99ef15f18b0bcb7ff503cca4a2942f..8a2e3f80f67b0716b3d1854418b187943dcff11a:/include/wx/settings.h?ds=sidebyside diff --git a/include/wx/settings.h b/include/wx/settings.h index 556e932500..3fe46534e0 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -15,7 +15,7 @@ #include "wx/colour.h" #include "wx/font.h" -class WXDLLEXPORT wxWindow; +class WXDLLIMPEXP_FWD_CORE wxWindow; // possible values for wxSystemSettings::GetFont() parameter // @@ -79,6 +79,7 @@ enum wxSystemColour wxSYS_COLOUR_GRADIENTINACTIVECAPTION, wxSYS_COLOUR_MENUHILIGHT, wxSYS_COLOUR_MENUBAR, + wxSYS_COLOUR_LISTBOXTEXT, wxSYS_COLOUR_MAX }; @@ -125,7 +126,8 @@ 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 @@ -158,7 +160,7 @@ enum wxSystemScreenType // 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 @@ -178,7 +180,7 @@ public: // include the declaration of the real platform-dependent class // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative +class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative { public: #ifdef __WXUNIVERSAL__ @@ -186,6 +188,10 @@ public: // 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 @@ -198,13 +204,6 @@ public: // Value static wxSystemScreenType ms_screen; -#if WXWIN_COMPATIBILITY_2_4 - // the backwards compatible versions of wxSystemSettingsNative functions, - // don't use these methods in the new code! - wxDEPRECATED(static wxColour GetSystemColour(int index)); - wxDEPRECATED(static wxFont GetSystemFont(int index)); - wxDEPRECATED(static int GetSystemMetric(int index)); -#endif }; #endif