mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-26 15:49:50 -06:00
wxWidgets3: update to svn r70933
This commit is contained in:
Shawn Hoffman
370
Externals/wxWidgets3/include/wx/defs.h
vendored
370
Externals/wxWidgets3/include/wx/defs.h
vendored
@ -4,7 +4,7 @@
|
||||
* Author: Julian Smart and others
|
||||
* Modified by: Ryan Norton (Converted to C)
|
||||
* Created: 01/02/97
|
||||
* RCS-ID: $Id: defs.h 66711 2011-01-19 10:47:49Z VZ $
|
||||
* RCS-ID: $Id: defs.h 70353 2012-01-15 14:46:41Z VZ $
|
||||
* Copyright: (c) Julian Smart
|
||||
* Licence: wxWindows licence
|
||||
*/
|
||||
@ -14,8 +14,10 @@
|
||||
#ifndef _WX_DEFS_H_
|
||||
#define _WX_DEFS_H_
|
||||
|
||||
// NOTE: this symbol will be replaced with "WXWIN_COMPATIBILITY_3_0" as soon
|
||||
// as the development branch for 3.1 is created
|
||||
/*
|
||||
NOTE: this symbol will be replaced with "WXWIN_COMPATIBILITY_3_0" as soon
|
||||
as the development branch for 3.1 is created
|
||||
*/
|
||||
#define FUTURE_WXWIN_COMPATIBILITY_3_0 1
|
||||
#define wxDEPRECATED_FUTURE( x ) x
|
||||
|
||||
@ -29,11 +31,8 @@
|
||||
/* Make sure the environment is set correctly */
|
||||
# if defined(__WXMSW__) && defined(__X__)
|
||||
# error "Target can't be both X and Windows"
|
||||
# elif defined(__WXMSW__) && defined(__PALMOS__)
|
||||
# error "Target can't be both PalmOS and Windows"
|
||||
# elif !defined(__WXMOTIF__) && \
|
||||
!defined(__WXMSW__) && \
|
||||
!defined(__WXPALMOS__)&& \
|
||||
!defined(__WXGTK__) && \
|
||||
!defined(__WXPM__) && \
|
||||
!defined(__WXOSX_CARBON__) && \
|
||||
@ -41,7 +40,6 @@
|
||||
!defined(__WXOSX_IPHONE__) && \
|
||||
!defined(__WXCOCOA__) && \
|
||||
!defined(__X__) && \
|
||||
!defined(__WXMGL__) && \
|
||||
!defined(__WXDFB__) && \
|
||||
!defined(__WXX11__) && \
|
||||
wxUSE_GUI
|
||||
@ -79,8 +77,10 @@
|
||||
# pragma warning(disable:4514) /* unreferenced inline func has been removed */
|
||||
# pragma warning(disable:4710) /* function not inlined */
|
||||
|
||||
// TODO: this warning should really be enabled as it can be genuinely
|
||||
// useful, check where does it occur in wxWidgets
|
||||
/*
|
||||
TODO: this warning should really be enabled as it can be genuinely
|
||||
useful, check where does it occur in wxWidgets
|
||||
*/
|
||||
#pragma warning(disable: 4127) /* conditional expression is constant */
|
||||
|
||||
/* There are too many false positivies for this one, particularly when
|
||||
@ -89,6 +89,16 @@
|
||||
class 'bar'" */
|
||||
# pragma warning(disable:4251)
|
||||
|
||||
/*
|
||||
This is a similar warning which occurs when deriving from standard
|
||||
containers. MSDN even mentions that it can be ignored in this case
|
||||
(albeit only in debug build while the warning is the same in release
|
||||
too and seems equally harmless).
|
||||
*/
|
||||
#if wxUSE_STD_CONTAINERS
|
||||
# pragma warning(disable:4275)
|
||||
#endif /* wxUSE_STD_CONTAINERS */
|
||||
|
||||
# ifdef __VISUALC5__
|
||||
/* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */
|
||||
/* is buggy, and occurs for code that does actually get executed */
|
||||
@ -115,7 +125,7 @@
|
||||
*/
|
||||
#ifdef __VISUALC6__
|
||||
#pragma warning(disable: 4284)
|
||||
#endif // VC6
|
||||
#endif /* VC6 */
|
||||
|
||||
/*
|
||||
When compiling with VC++ 7 /Wp64 option we get thousands of warnings for
|
||||
@ -388,15 +398,15 @@ typedef short int WXTYPE;
|
||||
|
||||
|
||||
#ifndef HAVE_WOSTREAM
|
||||
// Mingw <= 3.4 and all versions of Cygwin as well as any gcc version (so
|
||||
// far) targeting PalmOS don't have std::wostream
|
||||
#if defined(__PALMOS__) || \
|
||||
(defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) || \
|
||||
/*
|
||||
Mingw <= 3.4 and all versions of Cygwin don't have std::wostream
|
||||
*/
|
||||
#if (defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) || \
|
||||
defined(__CYGWIN__)
|
||||
#define wxNO_WOSTREAM
|
||||
#endif
|
||||
|
||||
// VC++ doesn't have it in the old iostream library
|
||||
/* VC++ doesn't have it in the old iostream library */
|
||||
#if defined(__VISUALC__) && wxUSE_IOSTREAMH
|
||||
#define wxNO_WOSTREAM
|
||||
#endif
|
||||
@ -408,12 +418,12 @@ typedef short int WXTYPE;
|
||||
#undef wxNO_WOSTREAM
|
||||
#endif /* HAVE_WOSTREAM */
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// other C++ features
|
||||
// ----------------------------------------------------------------------------
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
/* other C++ features */
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
|
||||
#ifndef HAVE_PARTIAL_SPECIALIZATION
|
||||
// be optimistic by default
|
||||
/* be optimistic by default */
|
||||
#define HAVE_PARTIAL_SPECIALIZATION
|
||||
#endif
|
||||
|
||||
@ -421,17 +431,17 @@ typedef short int WXTYPE;
|
||||
#if __VISUALC__ < 1310
|
||||
#undef HAVE_PARTIAL_SPECIALIZATION
|
||||
#endif
|
||||
#endif // __VISUALC__
|
||||
#endif /* __VISUALC__ */
|
||||
|
||||
|
||||
#ifndef HAVE_TEMPLATE_OVERLOAD_RESOLUTION
|
||||
// assume the compiler can use type or const expressions as template
|
||||
// arguments if it supports partial specialization -- except if it's a
|
||||
// Borland one which can't
|
||||
/* assume the compiler can use type or const expressions as template
|
||||
arguments if it supports partial specialization -- except if it's a
|
||||
Borland one which can't */
|
||||
#if defined(HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__)
|
||||
#define HAVE_TEMPLATE_OVERLOAD_RESOLUTION
|
||||
#endif // __BORLANDC__
|
||||
#endif // !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION)
|
||||
#endif /* (HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__) */
|
||||
#endif /* !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) */
|
||||
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
/* portable calling conventions macros */
|
||||
@ -513,15 +523,14 @@ typedef short int WXTYPE;
|
||||
#define wxDEPRECATED(x) x
|
||||
#endif
|
||||
|
||||
/*
|
||||
explicitly specifying inline allows gcc < 3.4 to
|
||||
handle the deprecation attribute even in the constructor.
|
||||
doesn't seem to work on Apple's gcc 4.0.1 unless using -O0
|
||||
*/
|
||||
#if wxCHECK_GCC_VERSION(3, 4) || defined( __DARWIN__ )
|
||||
#define wxDEPRECATED_CONSTRUCTOR(x) x
|
||||
#else
|
||||
#if defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 4)
|
||||
/*
|
||||
We need to add dummy "inline" to allow gcc < 3.4 to handle the
|
||||
deprecation attribute on the constructors.
|
||||
*/
|
||||
#define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x)
|
||||
#else
|
||||
#define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED(x)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -564,7 +573,7 @@ typedef short int WXTYPE;
|
||||
/* NULL declaration: it must be defined as 0 for C++ programs (in particular, */
|
||||
/* it must not be defined as "(void *)0" which is standard for C but completely */
|
||||
/* breaks C++ code) */
|
||||
#if !defined(__HANDHELDPC__) && !defined(__PALMOS__)
|
||||
#if !defined(__HANDHELDPC__)
|
||||
#include <stddef.h>
|
||||
#endif
|
||||
|
||||
@ -767,7 +776,7 @@ enum { wxDefaultCoord = -1 };
|
||||
/* define fixed length types */
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
|
||||
#if defined(__WXPALMOS__) || defined(__MINGW32__)
|
||||
#if defined(__MINGW32__)
|
||||
#if !defined(__MWERKS__)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
@ -819,19 +828,7 @@ typedef wxUint16 wxWord;
|
||||
*/
|
||||
|
||||
/* 32bit */
|
||||
#ifdef __PALMOS__
|
||||
typedef int wxInt32;
|
||||
typedef unsigned int wxUint32;
|
||||
#define SIZEOF_INT 4
|
||||
#define SIZEOF_LONG 4
|
||||
#define SIZEOF_WCHAR_T 2
|
||||
#define SIZEOF_SIZE_T 4
|
||||
#ifdef __WXPALMOS6__
|
||||
#define wxSIZE_T_IS_UINT
|
||||
#endif
|
||||
#define SIZEOF_VOID_P 4
|
||||
#define SIZEOF_SIZE_T 4
|
||||
#elif defined(__WINDOWS__)
|
||||
#if defined(__WINDOWS__)
|
||||
#if defined(__WIN32__)
|
||||
typedef int wxInt32;
|
||||
typedef unsigned int wxUint32;
|
||||
@ -1018,14 +1015,6 @@ typedef wxUint32 wxDword;
|
||||
#error "The 64 bit integer support in CodeWarrior has been disabled."
|
||||
#error "See the documentation on the 'longlong' pragma."
|
||||
#endif
|
||||
#elif defined(__WXPALMOS__)
|
||||
#if defined(__WXPALMOS6__)
|
||||
#define wxLongLong_t int64_t
|
||||
#else
|
||||
#define wxLongLong_t long long
|
||||
#endif /* __WXPALMOS6__ */
|
||||
#define wxLongLongSuffix ll
|
||||
#define wxLongLongFmtSpec "ll"
|
||||
#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
|
||||
#define wxLongLong_t long long
|
||||
#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \
|
||||
@ -1045,16 +1034,7 @@ typedef wxUint32 wxDword;
|
||||
|
||||
|
||||
#ifdef wxLongLong_t
|
||||
|
||||
#ifdef __WXPALMOS__
|
||||
#if defined(__WXPALMOS6__)
|
||||
#define wxULongLong_t uint64_t
|
||||
#else
|
||||
#define wxULongLong_t unsigned long long
|
||||
#endif /* __WXPALMOS6__ */
|
||||
#else
|
||||
#define wxULongLong_t unsigned wxLongLong_t
|
||||
#endif
|
||||
#define wxULongLong_t unsigned wxLongLong_t
|
||||
|
||||
/*
|
||||
wxLL() and wxULL() macros allow to define 64 bit constants in a
|
||||
@ -1064,8 +1044,10 @@ typedef wxUint32 wxDword;
|
||||
#define wxLL(x) wxCONCAT(x, wxLongLongSuffix)
|
||||
#define wxULL(x) wxCONCAT(x, wxCONCAT(u, wxLongLongSuffix))
|
||||
#else
|
||||
// Currently only Borland compiler has broken concatenation operator
|
||||
// and this compiler is known to use [u]i64 suffix.
|
||||
/*
|
||||
Currently only Borland compiler has broken concatenation operator
|
||||
and this compiler is known to use [u]i64 suffix.
|
||||
*/
|
||||
#define wxLL(x) wxAPPEND_i64(x)
|
||||
#define wxULL(x) wxAPPEND_ui64(x)
|
||||
#endif
|
||||
@ -1102,8 +1084,6 @@ typedef wxUint32 wxDword;
|
||||
#if defined(_SSIZE_T_) || defined(_SSIZE_T_DEFINED)
|
||||
#define HAVE_SSIZE_T
|
||||
#endif
|
||||
#elif defined(__PALMOS__)
|
||||
#define HAVE_SSIZE_T
|
||||
#elif wxCHECK_WATCOM_VERSION(1,4)
|
||||
#define HAVE_SSIZE_T
|
||||
#endif
|
||||
@ -1114,7 +1094,7 @@ typedef wxUint32 wxDword;
|
||||
#ifdef __UNIX__
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#else // !HAVE_SSIZE_T
|
||||
#else /* !HAVE_SSIZE_T */
|
||||
#if SIZEOF_SIZE_T == 4
|
||||
typedef wxInt32 ssize_t;
|
||||
#elif SIZEOF_SIZE_T == 8
|
||||
@ -1127,11 +1107,13 @@ typedef wxUint32 wxDword;
|
||||
#define HAVE_SSIZE_T
|
||||
#endif
|
||||
|
||||
// we can't rely on Windows _W64 being defined as windows.h may not be included
|
||||
// so define our own equivalent: this should be used with types like WXLPARAM
|
||||
// or WXWPARAM which are 64 bit under Win64 to avoid warnings each time we cast
|
||||
// it to a pointer or a handle (which results in hundreds of warnings as Win32
|
||||
// API often passes pointers in them)
|
||||
/*
|
||||
We can't rely on Windows _W64 being defined as windows.h may not be
|
||||
included so define our own equivalent: this should be used with types
|
||||
like WXLPARAM or WXWPARAM which are 64 bit under Win64 to avoid warnings
|
||||
each time we cast it to a pointer or a handle (which results in hundreds
|
||||
of warnings as Win32 API often passes pointers in them)
|
||||
*/
|
||||
#if wxCHECK_VISUALC_VERSION(7)
|
||||
#define wxW64 __w64
|
||||
#else
|
||||
@ -1142,7 +1124,13 @@ typedef wxUint32 wxDword;
|
||||
Define signed and unsigned integral types big enough to contain all of long,
|
||||
size_t and void *.
|
||||
*/
|
||||
#if SIZEOF_SIZE_T >= SIZEOF_VOID_P
|
||||
#if SIZEOF_LONG >= SIZEOF_VOID_P
|
||||
/*
|
||||
Normal case when long is the largest integral type.
|
||||
*/
|
||||
typedef long wxIntPtr;
|
||||
typedef unsigned long wxUIntPtr;
|
||||
#elif SIZEOF_SIZE_T >= SIZEOF_VOID_P
|
||||
/*
|
||||
Win64 case: size_t is the only integral type big enough for "void *".
|
||||
|
||||
@ -1152,12 +1140,6 @@ typedef wxUint32 wxDword;
|
||||
*/
|
||||
typedef wxW64 ssize_t wxIntPtr;
|
||||
typedef size_t wxUIntPtr;
|
||||
#elif SIZEOF_LONG >= SIZEOF_VOID_P
|
||||
/*
|
||||
Normal case when long is the largest integral type.
|
||||
*/
|
||||
typedef long wxIntPtr;
|
||||
typedef unsigned long wxUIntPtr;
|
||||
#else
|
||||
/*
|
||||
This should never happen for the current architectures but if you're
|
||||
@ -1447,12 +1429,12 @@ typedef double wxDouble;
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
|
||||
#if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3, 4 )
|
||||
// GCC <= 3.4 has buggy template support
|
||||
/* GCC <= 3.4 has buggy template support */
|
||||
# define wxUSE_MEMBER_TEMPLATES 0
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER <= 1200
|
||||
// MSVC <= 6.0 has buggy template support
|
||||
/* MSVC <= 6.0 has buggy template support */
|
||||
# define wxUSE_MEMBER_TEMPLATES 0
|
||||
# define wxUSE_FUNC_TEMPLATE_POINTER 0
|
||||
#endif
|
||||
@ -1532,9 +1514,11 @@ enum wxDirection
|
||||
|
||||
enum wxAlignment
|
||||
{
|
||||
// 0 is a valid wxAlignment value (both wxALIGN_LEFT and wxALIGN_TOP use
|
||||
// it) so define a symbolic name for an invalid alignment value which can
|
||||
// be assumed to be different from anything else
|
||||
/*
|
||||
0 is a valid wxAlignment value (both wxALIGN_LEFT and wxALIGN_TOP
|
||||
use it) so define a symbolic name for an invalid alignment value
|
||||
which can be assumed to be different from anything else
|
||||
*/
|
||||
wxALIGN_INVALID = -1,
|
||||
|
||||
wxALIGN_NOT = 0x0000,
|
||||
@ -1557,10 +1541,12 @@ enum wxAlignment
|
||||
/* misc. flags for wxSizer items */
|
||||
enum wxSizerFlagBits
|
||||
{
|
||||
// wxADJUST_MINSIZE doesn't do anything any more but we still define it for
|
||||
// compatibility. Notice that it may be also predefined (as 0, hopefully)
|
||||
// in the user code in order to use it even in !WXWIN_COMPATIBILITY_2_8
|
||||
// builds so don't redefine it in such case.
|
||||
/*
|
||||
wxADJUST_MINSIZE doesn't do anything any more but we still define
|
||||
it for compatibility. Notice that it may be also predefined (as 0,
|
||||
hopefully) in the user code in order to use it even in
|
||||
!WXWIN_COMPATIBILITY_2_8 builds so don't redefine it in such case.
|
||||
*/
|
||||
#if WXWIN_COMPATIBILITY_2_8 && !defined(wxADJUST_MINSIZE)
|
||||
wxADJUST_MINSIZE = 0,
|
||||
#endif
|
||||
@ -1848,14 +1834,12 @@ enum wxBorder
|
||||
/* Old names for compatibility */
|
||||
#define wxRA_HORIZONTAL wxHORIZONTAL
|
||||
#define wxRA_VERTICAL wxVERTICAL
|
||||
#define wxRA_USE_CHECKBOX 0x0010 /* alternative native subcontrols (wxPalmOS) */
|
||||
|
||||
/*
|
||||
* wxRadioButton style flag
|
||||
*/
|
||||
#define wxRB_GROUP 0x0004
|
||||
#define wxRB_SINGLE 0x0008
|
||||
#define wxRB_USE_CHECKBOX 0x0010 /* alternative native control (wxPalmOS) */
|
||||
|
||||
/*
|
||||
* wxScrollBar flags
|
||||
@ -1929,12 +1913,12 @@ enum wxBorder
|
||||
#define wxICON_STOP wxICON_HAND
|
||||
#define wxICON_ASTERISK wxICON_INFORMATION
|
||||
|
||||
#define wxFORWARD 0x00001000
|
||||
#define wxBACKWARD 0x00002000
|
||||
#define wxRESET 0x00004000
|
||||
#define wxHELP 0x00008000
|
||||
#define wxMORE 0x00010000
|
||||
#define wxSETUP 0x00020000
|
||||
#define wxHELP 0x00001000
|
||||
#define wxFORWARD 0x00002000
|
||||
#define wxBACKWARD 0x00004000
|
||||
#define wxRESET 0x00008000
|
||||
#define wxMORE 0x00010000
|
||||
#define wxSETUP 0x00020000
|
||||
#define wxICON_NONE 0x00040000
|
||||
|
||||
#define wxICON_MASK \
|
||||
@ -1945,29 +1929,37 @@ enum wxBorder
|
||||
*/
|
||||
enum wxBackgroundStyle
|
||||
{
|
||||
// background is erased in the EVT_ERASE_BACKGROUND handler or using the
|
||||
// system default background if no such handler is defined (this is the
|
||||
// default style)
|
||||
/*
|
||||
background is erased in the EVT_ERASE_BACKGROUND handler or using
|
||||
the system default background if no such handler is defined (this
|
||||
is the default style)
|
||||
*/
|
||||
wxBG_STYLE_ERASE,
|
||||
|
||||
// background is erased by the system, no EVT_ERASE_BACKGROUND event is
|
||||
// generated at all
|
||||
/*
|
||||
background is erased by the system, no EVT_ERASE_BACKGROUND event
|
||||
is generated at all
|
||||
*/
|
||||
wxBG_STYLE_SYSTEM,
|
||||
|
||||
// background is erased in EVT_PAINT handler and not erased at all before
|
||||
// it, this should be used if the paint handler paints over the entire
|
||||
// window to avoid flicker
|
||||
/*
|
||||
background is erased in EVT_PAINT handler and not erased at all
|
||||
before it, this should be used if the paint handler paints over
|
||||
the entire window to avoid flicker
|
||||
*/
|
||||
wxBG_STYLE_PAINT,
|
||||
|
||||
|
||||
// this is a Mac-only style, don't use in portable code
|
||||
/* this is a Mac-only style, don't use in portable code */
|
||||
wxBG_STYLE_TRANSPARENT,
|
||||
|
||||
// this style is deprecated and doesn't do anything, don't use
|
||||
/* this style is deprecated and doesn't do anything, don't use */
|
||||
wxBG_STYLE_COLOUR,
|
||||
|
||||
// this style is deprecated and is synonymous with wxBG_STYLE_PAINT, use
|
||||
// the new name
|
||||
/*
|
||||
this style is deprecated and is synonymous with
|
||||
wxBG_STYLE_PAINT, use the new name
|
||||
*/
|
||||
wxBG_STYLE_CUSTOM = wxBG_STYLE_PAINT
|
||||
};
|
||||
|
||||
@ -2203,6 +2195,18 @@ enum wxItemKind
|
||||
wxITEM_MAX
|
||||
};
|
||||
|
||||
/*
|
||||
* The possible states of a 3-state checkbox (Compatible
|
||||
* with the 2-state checkbox).
|
||||
*/
|
||||
enum wxCheckBoxState
|
||||
{
|
||||
wxCHK_UNCHECKED,
|
||||
wxCHK_CHECKED,
|
||||
wxCHK_UNDETERMINED /* 3-state checkbox only */
|
||||
};
|
||||
|
||||
|
||||
/* hit test results */
|
||||
enum wxHitTest
|
||||
{
|
||||
@ -2297,7 +2301,7 @@ enum wxDeprecatedGUIConstants
|
||||
wxTRANSPARENT,
|
||||
|
||||
/* Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */
|
||||
/* Note also that stippling a Pen IS meaningfull, because a Line is */
|
||||
/* Note also that stippling a Pen IS meaningful, because a Line is */
|
||||
wxSTIPPLE_MASK_OPAQUE, /* mask is used for blitting monochrome using text fore and back ground colors */
|
||||
wxSTIPPLE_MASK, /* mask is used for masking areas in the stipple bitmap (TO DO) */
|
||||
/* drawn with a Pen, and without any Brush -- and it can be stippled. */
|
||||
@ -2354,7 +2358,34 @@ enum wxKeyCode
|
||||
{
|
||||
WXK_NONE = 0,
|
||||
|
||||
WXK_BACK = 8, // backspace
|
||||
WXK_CONTROL_A = 1,
|
||||
WXK_CONTROL_B,
|
||||
WXK_CONTROL_C,
|
||||
WXK_CONTROL_D,
|
||||
WXK_CONTROL_E,
|
||||
WXK_CONTROL_F,
|
||||
WXK_CONTROL_G,
|
||||
WXK_CONTROL_H,
|
||||
WXK_CONTROL_I,
|
||||
WXK_CONTROL_J,
|
||||
WXK_CONTROL_K,
|
||||
WXK_CONTROL_L,
|
||||
WXK_CONTROL_M,
|
||||
WXK_CONTROL_N,
|
||||
WXK_CONTROL_O,
|
||||
WXK_CONTROL_P,
|
||||
WXK_CONTROL_Q,
|
||||
WXK_CONTROL_R,
|
||||
WXK_CONTROL_S,
|
||||
WXK_CONTROL_T,
|
||||
WXK_CONTROL_U,
|
||||
WXK_CONTROL_V,
|
||||
WXK_CONTROL_W,
|
||||
WXK_CONTROL_X,
|
||||
WXK_CONTROL_Y,
|
||||
WXK_CONTROL_Z,
|
||||
|
||||
WXK_BACK = 8, /* backspace */
|
||||
WXK_TAB = 9,
|
||||
WXK_RETURN = 13,
|
||||
WXK_ESCAPE = 27,
|
||||
@ -2477,7 +2508,12 @@ enum wxKeyCode
|
||||
WXK_WINDOWS_LEFT,
|
||||
WXK_WINDOWS_RIGHT,
|
||||
WXK_WINDOWS_MENU ,
|
||||
WXK_COMMAND,
|
||||
#ifdef __WXOSX__
|
||||
WXK_RAW_CONTROL,
|
||||
#else
|
||||
WXK_RAW_CONTROL = WXK_CONTROL,
|
||||
#endif
|
||||
WXK_COMMAND = WXK_CONTROL,
|
||||
|
||||
/* Hardware-specific buttons */
|
||||
WXK_SPECIAL1 = 193,
|
||||
@ -2513,10 +2549,11 @@ enum wxKeyModifier
|
||||
wxMOD_META = 0x0008,
|
||||
wxMOD_WIN = wxMOD_META,
|
||||
#if defined(__WXMAC__) || defined(__WXCOCOA__)
|
||||
wxMOD_CMD = wxMOD_META,
|
||||
wxMOD_RAW_CONTROL = 0x0010,
|
||||
#else
|
||||
wxMOD_CMD = wxMOD_CONTROL,
|
||||
wxMOD_RAW_CONTROL = wxMOD_CONTROL,
|
||||
#endif
|
||||
wxMOD_CMD = wxMOD_CONTROL,
|
||||
wxMOD_ALL = 0xffff
|
||||
};
|
||||
|
||||
@ -2733,7 +2770,7 @@ typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
|
||||
#endif
|
||||
|
||||
#if defined(__CYGWIN__) && defined(__WXMSW__)
|
||||
# if wxUSE_STL || defined(wxUSE_STD_STRING)
|
||||
# if wxUSE_STD_CONTAINERS || defined(wxUSE_STD_STRING)
|
||||
/*
|
||||
NASTY HACK because the gethostname in sys/unistd.h which the gnu
|
||||
stl includes and wx builds with by default clash with each other
|
||||
@ -2786,7 +2823,7 @@ typedef void* WXDisplay;
|
||||
|
||||
typedef const void * CFTypeRef;
|
||||
|
||||
// typedef const struct __CFString * CFStringRef;
|
||||
/* typedef const struct __CFString * CFStringRef; */
|
||||
|
||||
#define DECLARE_WXOSX_OPAQUE_CFREF( name ) typedef struct __##name* name##Ref;
|
||||
#define DECLARE_WXOSX_OPAQUE_CONST_CFREF( name ) typedef const struct __##name* name##Ref;
|
||||
@ -2964,42 +3001,7 @@ typedef WX_NSString* WXGLPixelFormat;
|
||||
|
||||
#endif
|
||||
|
||||
#endif // __WXMAC__
|
||||
|
||||
#if defined(__WXPALMOS__)
|
||||
|
||||
typedef void * WXHWND;
|
||||
typedef void * WXHANDLE;
|
||||
typedef void * WXHICON;
|
||||
typedef void * WXHFONT;
|
||||
typedef void * WXHMENU;
|
||||
typedef void * WXHPEN;
|
||||
typedef void * WXHBRUSH;
|
||||
typedef void * WXHPALETTE;
|
||||
typedef void * WXHCURSOR;
|
||||
typedef void * WXHRGN;
|
||||
typedef void * WXHACCEL;
|
||||
typedef void * WXHINSTANCE;
|
||||
typedef void * WXHBITMAP;
|
||||
typedef void * WXHIMAGELIST;
|
||||
typedef void * WXHGLOBAL;
|
||||
typedef void * WXHDC;
|
||||
typedef unsigned int WXUINT;
|
||||
typedef unsigned long WXDWORD;
|
||||
typedef unsigned short WXWORD;
|
||||
|
||||
typedef unsigned long WXCOLORREF;
|
||||
typedef struct tagMSG WXMSG;
|
||||
|
||||
typedef WXHWND WXWINHANDLE; /* WinHandle of PalmOS */
|
||||
typedef WXWINHANDLE WXWidget;
|
||||
|
||||
typedef void * WXFORMPTR;
|
||||
typedef void * WXEVENTPTR;
|
||||
typedef void * WXRECTANGLEPTR;
|
||||
|
||||
#endif /* __WXPALMOS__ */
|
||||
|
||||
#endif /* __WXMAC__ */
|
||||
|
||||
/* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */
|
||||
#if defined(__WIN32__)
|
||||
@ -3208,53 +3210,45 @@ typedef long WXPixel; /* safety catch in src/motif/colour.cpp */
|
||||
#ifdef __WXGTK__
|
||||
|
||||
/* Stand-ins for GLIB types */
|
||||
typedef char gchar;
|
||||
typedef signed char gint8;
|
||||
typedef int gint;
|
||||
typedef unsigned guint;
|
||||
typedef unsigned long gulong;
|
||||
typedef void* gpointer;
|
||||
typedef struct _GSList GSList;
|
||||
|
||||
/* Stand-ins for GDK types */
|
||||
typedef struct _GdkColor GdkColor;
|
||||
typedef struct _GdkColormap GdkColormap;
|
||||
typedef struct _GdkFont GdkFont;
|
||||
typedef struct _GdkGC GdkGC;
|
||||
typedef struct _GdkVisual GdkVisual;
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
typedef struct _GdkAtom *GdkAtom;
|
||||
typedef struct _GdkDrawable GdkWindow;
|
||||
typedef struct _GdkDrawable GdkBitmap;
|
||||
typedef struct _GdkDrawable GdkPixmap;
|
||||
#else /* GTK+ 1.2 */
|
||||
typedef gulong GdkAtom;
|
||||
typedef struct _GdkWindow GdkWindow;
|
||||
typedef struct _GdkWindow GdkBitmap;
|
||||
typedef struct _GdkWindow GdkPixmap;
|
||||
#endif /* GTK+ 1.2/2.0 */
|
||||
|
||||
typedef struct _GdkCursor GdkCursor;
|
||||
typedef struct _GdkRegion GdkRegion;
|
||||
typedef struct _GdkDragContext GdkDragContext;
|
||||
|
||||
#ifdef HAVE_XIM
|
||||
typedef struct _GdkIC GdkIC;
|
||||
typedef struct _GdkICAttr GdkICAttr;
|
||||
#if defined(__WXGTK20__)
|
||||
typedef struct _GdkAtom* GdkAtom;
|
||||
#else
|
||||
typedef unsigned long GdkAtom;
|
||||
#endif
|
||||
|
||||
#if !defined(__WXGTK30__)
|
||||
typedef struct _GdkColormap GdkColormap;
|
||||
typedef struct _GdkFont GdkFont;
|
||||
typedef struct _GdkGC GdkGC;
|
||||
typedef struct _GdkRegion GdkRegion;
|
||||
#endif
|
||||
|
||||
#if defined(__WXGTK30__)
|
||||
typedef struct _GdkWindow GdkWindow;
|
||||
#elif defined(__WXGTK20__)
|
||||
typedef struct _GdkDrawable GdkWindow;
|
||||
typedef struct _GdkDrawable GdkPixmap;
|
||||
#else
|
||||
typedef struct _GdkWindow GdkWindow;
|
||||
typedef struct _GdkWindow GdkBitmap;
|
||||
typedef struct _GdkWindow GdkPixmap;
|
||||
#endif
|
||||
|
||||
/* Stand-ins for GTK types */
|
||||
typedef struct _GtkWidget GtkWidget;
|
||||
typedef struct _GtkRcStyle GtkRcStyle;
|
||||
typedef struct _GtkAdjustment GtkAdjustment;
|
||||
typedef struct _GtkList GtkList;
|
||||
typedef struct _GtkToolbar GtkToolbar;
|
||||
typedef struct _GtkTooltips GtkTooltips;
|
||||
typedef struct _GtkNotebook GtkNotebook;
|
||||
typedef struct _GtkNotebookPage GtkNotebookPage;
|
||||
typedef struct _GtkAccelGroup GtkAccelGroup;
|
||||
typedef struct _GtkItemFactory GtkItemFactory;
|
||||
typedef struct _GtkSelectionData GtkSelectionData;
|
||||
typedef struct _GtkTextBuffer GtkTextBuffer;
|
||||
typedef struct _GtkRange GtkRange;
|
||||
@ -3282,10 +3276,6 @@ typedef struct _PangoLayout PangoLayout;
|
||||
typedef struct _PangoFontDescription PangoFontDescription;
|
||||
#endif
|
||||
|
||||
#ifdef __WXMGL__
|
||||
typedef struct window_t *WXWidget;
|
||||
#endif /* MGL */
|
||||
|
||||
#ifdef __WXDFB__
|
||||
/* DirectFB doesn't have the concept of non-TLW window, so use
|
||||
something arbitrary */
|
||||
@ -3328,7 +3318,7 @@ typedef const void* WXWidget;
|
||||
private: \
|
||||
classname& operator=(const classname&)
|
||||
|
||||
// deprecated variants _not_ requiring a semicolon after them
|
||||
/* deprecated variants _not_ requiring a semicolon after them */
|
||||
#define DECLARE_NO_COPY_CLASS(classname) \
|
||||
wxDECLARE_NO_COPY_CLASS(classname);
|
||||
#define DECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) \
|
||||
|
||||
Reference in New Issue
Block a user