@@ -52,7 +52,7 @@
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
// #undef the macros defined in winsows.h which conflict with code elsewhere
|
||||
// #undef the macros defined in windows.h which conflict with code elsewhere
|
||||
#include "wx/msw/winundef.h"
|
||||
|
||||
#endif // _WX_WRAPWIN_H_
|
||||
|
||||
@@ -789,7 +789,7 @@ public:
|
||||
|
||||
In addition to the features provided by wxAppConsole it keeps track of
|
||||
the <em>top window</em> (see SetTopWindow()) and adds support for
|
||||
video modes (see SetVideoMode()).
|
||||
video modes (see SetDisplayMode()).
|
||||
|
||||
In general, application-wide settings for GUI-only apps are accessible
|
||||
from wxApp (or from wxSystemSettings or wxSystemOptions classes).
|
||||
|
||||
@@ -147,8 +147,7 @@ public:
|
||||
NZST = GMT12, //!< Standard Time
|
||||
NZDT = GMT13, //!< Daylight Saving Time
|
||||
|
||||
/// Universal Coordinated Time = the new and politically correct name
|
||||
/// for GMT.
|
||||
/// Universal Coordinated Time
|
||||
UTC = GMT0
|
||||
};
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
enum wxOperatingSystemId
|
||||
{
|
||||
wxOS_UNKNOWN = 0, //!< returned on error
|
||||
wxOS_UNKNOWN = 0, //!< Returned on error.
|
||||
|
||||
wxOS_MAC_OS = 1 << 0, //!< Apple Mac OS 8/9/X with Mac paths
|
||||
wxOS_MAC_OSX_DARWIN = 1 << 1, //!< Apple macOS with Unix paths
|
||||
@@ -28,7 +28,7 @@ enum wxOperatingSystemId
|
||||
//! A combination of all @c wxOS_MAC_* values previously listed.
|
||||
wxOS_MAC = wxOS_MAC_OS|wxOS_MAC_OSX_DARWIN,
|
||||
|
||||
wxOS_WINDOWS_NT = 1 << 3, //!< Windows NT family (XP/Vista/7/8/10)
|
||||
wxOS_WINDOWS_NT = 1 << 3, //!< Windows NT family (XP/Vista/7/8/10/11)
|
||||
|
||||
//! Any Windows system, currently can be only wxOS_WINDOWS_NT.
|
||||
wxOS_WINDOWS = wxOS_WINDOWS_NT,
|
||||
@@ -640,7 +640,7 @@ public:
|
||||
};
|
||||
|
||||
/**
|
||||
Returns true only for MSW programs running under Wine.
|
||||
Returns @true only for MSW programs running under Wine.
|
||||
|
||||
This function can be used to check for some functionality not implemented
|
||||
when using Wine.
|
||||
|
||||
@@ -363,7 +363,7 @@ public:
|
||||
|
||||
@a win is a pointer to the window for which the metric is requested.
|
||||
Specifying the @a win parameter is encouraged, because some metrics on some
|
||||
ports are not supported without one,or they might be capable of reporting
|
||||
ports are not supported without one, or they might be capable of reporting
|
||||
better values if given one. If a window does not make sense for a metric,
|
||||
one should still be given, as for example it might determine which displays
|
||||
cursor width is requested with wxSYS_CURSOR_X.
|
||||
|
||||
Reference in New Issue
Block a user