#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
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
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
// 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
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);
// include the declaration of the real platform-dependent class
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative
+class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative
{
public:
#ifdef __WXUNIVERSAL__
// 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
// 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