projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Under Cygwin, in platform.h default to wxMSW unless otherwise specified.
[wxWidgets.git]
/
include
/
wx
/
settings.h
diff --git
a/include/wx/settings.h
b/include/wx/settings.h
index 14d4e5fa3f74ec60cf464165b39e9766099b3271..af1b6bde812f073b4607882a6b9c23f29bc9144e 100644
(file)
--- a/
include/wx/settings.h
+++ b/
include/wx/settings.h
@@
-131,13
+131,14
@@
enum wxSystemFeature
};
// values for different screen designs
};
// values for different screen designs
-enum wxSystemScreen
+enum wxSystemScreen
Type
{
wxSYS_SCREEN_NONE = 0, // not yet defined
{
wxSYS_SCREEN_NONE = 0, // not yet defined
- wxSYS_SCREEN_DESKTOP, // >= 800x600
- wxSYS_SCREEN_
SMALL, // >= 640x480
+
+ wxSYS_SCREEN_
TINY, // <
wxSYS_SCREEN_PDA, // >= 320x240
wxSYS_SCREEN_PDA, // >= 320x240
- wxSYS_SCREEN_TINY // <
+ wxSYS_SCREEN_SMALL, // >= 640x480
+ wxSYS_SCREEN_DESKTOP // >= 800x600
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-171,7
+172,7
@@
public:
// include the declaration of the real platform-dependent class
// ----------------------------------------------------------------------------
// include the declaration of the real platform-dependent class
// ----------------------------------------------------------------------------
-class wxSystemSettings : public wxSystemSettingsNative
+class
WXDLLEXPORT
wxSystemSettings : public wxSystemSettingsNative
{
public:
#ifdef __WXUNIVERSAL__
{
public:
#ifdef __WXUNIVERSAL__
@@
-183,13
+184,13
@@
public:
// Get system screen design (desktop, pda, ..) used for
// laying out various dialogs.
// Get system screen design (desktop, pda, ..) used for
// laying out various dialogs.
- static wxSystemScreen
GetScreen
();
-
+ static wxSystemScreen
Type GetScreenType
();
+
// Override default.
// Override default.
- static void SetScreen
( wxSystemScreen
screen );
-
+ static void SetScreen
Type( wxSystemScreenType
screen );
+
// Value
// Value
- static wxSystemScreen ms_screen;
+ static wxSystemScreen
Type
ms_screen;
// the backwards compatible versions of wxSystemSettingsNative functions,
// the backwards compatible versions of wxSystemSettingsNative functions,