X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd3b171d3f45b0d30d6c1f7586dad5721b145650..9c54e4ae1f401a9c337b97b588e5a356d79cbe82:/include/wx/defs.h?ds=sidebyside diff --git a/include/wx/defs.h b/include/wx/defs.h index f991cbe8a1..d4c2f50058 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -16,6 +16,10 @@ #pragma interface "defs.h" #endif +#ifndef __cplusplus + #error "This header is for C++ code only" +#endif + // ---------------------------------------------------------------------------- // compiler and OS identification // ---------------------------------------------------------------------------- @@ -350,165 +354,8 @@ typedef int wxWindowID; // compatibility :-( #define CMPFUNC_CONV wxCMPFUNC_CONV -// ---------------------------------------------------------------------------- -// Making or using wxWindows as a Windows DLL -// ---------------------------------------------------------------------------- - -#if defined(__WXMSW__) - // __declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well - // as VC++ and gcc - #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNUC__) || defined(__WATCOMC__) - #define WXEXPORT __declspec(dllexport) - #define WXIMPORT __declspec(dllimport) - #else // compiler doesn't support __declspec() - #define WXEXPORT - #define WXIMPORT - #endif -#elif defined(__WXPM__) - #if defined (__WATCOMC__) - #define WXEXPORT __declspec(dllexport) - // __declspec(dllimport) prepends __imp to imported symbols. We do NOT - // want that! - #define WXIMPORT - #elif (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) - #define WXEXPORT _Export - #define WXIMPORT _Export - #endif -#elif defined(__WXMAC__) || defined(__WXCOCOA__) - #ifdef __MWERKS__ - #define WXEXPORT __declspec(export) - #define WXIMPORT __declspec(import) - #endif -#endif - -// for other platforms/compilers we don't anything -#ifndef WXEXPORT - #define WXEXPORT - #define WXIMPORT -#endif - -/* - We support building wxWindows as a set of several libraries but we don't - support arbitrary combinations of libs/DLLs: either we build all of them as - DLLs (in which case WXMAKINGDLL is defined) or none (it isn't). - - However we have a problem because we need separate WXDLLEXPORT versions for - different libraries as, for example, wxString class should be dllexported - when compiled in wxBase and dllimported otherwise, so we do define separate - WXMAKING/USINGDLL_XYZ constants for each component XYZ. - */ -#ifdef WXMAKINGDLL - #if wxUSE_BASE - #define WXMAKINGDLL_BASE - #endif - - #define WXMAKINGDLL_NET - #define WXMAKINGDLL_CORE - #define WXMAKINGDLL_ADV - #define WXMAKINGDLL_ODBC - #define WXMAKINGDLL_DBGRID - #define WXMAKINGDLL_HTML - #define WXMAKINGDLL_XML -#endif // WXMAKINGDLL - -// WXDLLEXPORT maps to export declaration when building the DLL, to import -// declaration if using it or to nothing at all if we don't use wxWin as DLL -#ifdef WXMAKINGDLL_BASE - #define WXDLLIMPEXP_BASE WXEXPORT - #define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_BASE WXIMPORT - #define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type -#else // not making nor using DLL - #define WXDLLIMPEXP_BASE - #define WXDLLIMPEXP_DATA_BASE(type) type -#endif - -#ifdef WXMAKINGDLL_NET - #define WXDLLIMPEXP_NET WXEXPORT - #define WXDLLIMPEXP_DATA_NET(type) WXEXPORT type -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_NET WXIMPORT - #define WXDLLIMPEXP_DATA_NET(type) WXIMPORT type -#else // not making nor using DLL - #define WXDLLIMPEXP_NET - #define WXDLLIMPEXP_DATA_NET(type) type -#endif - -#ifdef WXMAKINGDLL_CORE - #define WXDLLIMPEXP_CORE WXEXPORT - #define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_CORE WXIMPORT - #define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type -#else // not making nor using DLL - #define WXDLLIMPEXP_CORE - #define WXDLLIMPEXP_DATA_CORE(type) type -#endif - -#ifdef WXMAKINGDLL_ADV - #define WXDLLIMPEXP_ADV WXEXPORT - #define WXDLLIMPEXP_DATA_ADV(type) WXEXPORT type -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_ADV WXIMPORT - #define WXDLLIMPEXP_DATA_ADV(type) WXIMPORT type -#else // not making nor using DLL - #define WXDLLIMPEXP_ADV - #define WXDLLIMPEXP_DATA_ADV(type) type -#endif - -#ifdef WXMAKINGDLL_ODBC - #define WXDLLIMPEXP_ODBC WXEXPORT - #define WXDLLIMPEXP_DATA_ODBC(type) WXEXPORT type -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_ODBC WXIMPORT - #define WXDLLIMPEXP_DATA_ODBC(type) WXIMPORT type -#else // not making nor using DLL - #define WXDLLIMPEXP_ODBC - #define WXDLLIMPEXP_DATA_ODBC(type) type -#endif - -#ifdef WXMAKINGDLL_DBGRID - #define WXDLLIMPEXP_DBGRID WXEXPORT - #define WXDLLIMPEXP_DATA_DBGRID(type) WXEXPORT type -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_DBGRID WXIMPORT - #define WXDLLIMPEXP_DATA_DBGRID(type) WXIMPORT type -#else // not making nor using DLL - #define WXDLLIMPEXP_DBGRID - #define WXDLLIMPEXP_DATA_DBGRID(type) type -#endif - -#ifdef WXMAKINGDLL_HTML - #define WXDLLIMPEXP_HTML WXEXPORT - #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_HTML WXIMPORT - #define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type -#else // not making nor using DLL - #define WXDLLIMPEXP_HTML - #define WXDLLIMPEXP_DATA_HTML(type) type -#endif - -#ifdef WXMAKINGDLL_GL - #define WXDLLIMPEXP_GL WXEXPORT -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_GL WXIMPORT -#else // not making nor using DLL - #define WXDLLIMPEXP_GL -#endif - -#ifdef WXMAKINGDLL_XML - #define WXDLLIMPEXP_XML WXEXPORT -#elif defined(WXUSINGDLL) - #define WXDLLIMPEXP_XML WXIMPORT -#else // not making nor using DLL - #define WXDLLIMPEXP_XML -#endif - -// for backwards compatibility, define suffix-less versions too -#define WXDLLEXPORT WXDLLIMPEXP_CORE -#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE +// DLL import/export declarations +#include "wx/dlimpexp.h" // ---------------------------------------------------------------------------- // Very common macros @@ -545,29 +392,13 @@ typedef int wxWindowID; #endif // everybody gets the assert and other debug macros -#ifdef __cplusplus #include "wx/debug.h" -#endif // 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) #include -// Macro to cut down on compiler warnings. -#if REMOVE_UNUSED_ARG - #define WXUNUSED(identifier) /* identifier */ -#else // stupid, broken compiler - #define WXUNUSED(identifier) identifier -#endif - -// some arguments are only used in debug mode, but unused in release one -#ifdef __WXDEBUG__ - #define WXUNUSED_UNLESS_DEBUG(param) param -#else - #define WXUNUSED_UNLESS_DEBUG(param) WXUNUSED(param) -#endif - // delete pointer if it is not NULL and NULL it afterwards // (checking that it's !NULL before passing it to delete is just a // a question of style, because delete will do it itself anyhow, but it might @@ -581,19 +412,58 @@ typedef int wxWindowID; // size of statically declared array #define WXSIZEOF(array) (sizeof(array)/sizeof(array[0])) +// helper macros to concatenate two tokens together +#define wxCONCAT_HELPER(text, line) text ## line +#define wxCONCAT(text, line) wxCONCAT_HELPER(text, line) + // helper macros to be able to define unique/anonymous objects: this works by // appending the current line number to the given identifier to reduce the // probability of the conflict (it may still happen if this is used in the // headers, hence you should avoid doing it or provide unique prefixes then) -#define wxCONCAT(text, line) text ## line -#define wxCONCAT_LINE2(text, line) wxCONCAT(text, line) -#define wxCONCAT_LINE(text) wxCONCAT_LINE2(text, __LINE__) +#define wxCONCAT_LINE(text) wxCONCAT(text, __LINE__) #define wxMAKE_UNIQUE_NAME(text) wxCONCAT_LINE(text) // symbolic constant used by all Find()-like functions returning positive // integer on success as failure indicator #define wxNOT_FOUND (-1) +// ---------------------------------------------------------------------------- +// macros to avoid compiler warnings +// ---------------------------------------------------------------------------- + +// Macro to cut down on compiler warnings. +#if 1 // there should be no more any compilers needing the "#else" version + #define WXUNUSED(identifier) /* identifier */ +#else // stupid, broken compiler + #define WXUNUSED(identifier) identifier +#endif + +// some arguments are only used in debug mode, but unused in release one +#ifdef __WXDEBUG__ + #define WXUNUSED_UNLESS_DEBUG(param) param +#else + #define WXUNUSED_UNLESS_DEBUG(param) WXUNUSED(param) +#endif + +// some compilers give warning about a possibly unused variable if it is +// initialized in both branches of if/else and shut up if it is initialized +// when declared, but other compilers then give warnings about unused variable +// value -- this should satisfy both of them +#if defined(__VISUALC__) + #define wxDUMMY_INITIALIZE(val) = val +#else + #define wxDUMMY_INITIALIZE(val) +#endif + +// sometimes the value of a variable is *really* not used, to suppress the +// resulting warning you may pass it to this function +#ifdef __BORLANDC__ +#define wxUnusedVar(identifier) identifier +#else +template +inline void wxUnusedVar(const T& WXUNUSED(t)) { } +#endif + // ---------------------------------------------------------------------------- // compiler specific settings // ---------------------------------------------------------------------------- @@ -617,6 +487,10 @@ typedef int wxWindowID; #define except(x) catch(...) #endif // Metrowerks +#if defined(__WATCOMC__) + typedef short mode_t; +#endif + // where should i put this? we need to make sure of this as it breaks // the code. #if !wxUSE_IOSTREAMH && defined(__WXDEBUG__) @@ -689,70 +563,218 @@ enum #endif // Win16/!Win16 #endif // wxUSE_COMPATIBLE_COORD_TYPES/!wxUSE_COMPATIBLE_COORD_TYPES -// fixed length types -#define wxInt8 char signed -#define wxUint8 char unsigned +// ---------------------------------------------------------------------------- +// define fixed length types +// ---------------------------------------------------------------------------- + +// chars are always one byte (by definition), shorts are always two (in +// practice) + +// 8bit +#ifndef SIZEOF_CHAR + #define SIZEOF_CHAR 1 +#endif +typedef signed char wxInt8; +typedef unsigned char wxUint8; +typedef wxUint8 wxByte; + + +// 16bit +#ifdef SIZEOF_SHORT + #if SIZEOF_SHORT != 2 + #error "wxWindows assumes sizeof(short) == 2, please fix the code" + #endif +#else + #define SIZEOF_SHORT 2 +#endif + +typedef signed short wxInt16; +typedef unsigned short wxUint16; + +typedef wxUint16 wxWord; + +/* + things are getting more interesting with ints, longs and pointers + + there are several different standard data models described by this table: + +-----------+----------------------------+ + |type\model | LP64 ILP64 LLP64 ILP32 LP32| + +-----------+----------------------------+ + |char | 8 8 8 8 8 | + |short | 16 16 16 16 16 | + |int | 32 64 32 32 16 | + |long | 64 64 32 32 32 | + |long long | 64 | + |void * | 64 64 64 32 32 | + +-----------+----------------------------+ + + Win16 used LP32 (but we don't support it any longer), Win32 obviously used + ILP32 and Win64 uses LLP64 (a.k.a. P64) + + Under Unix LP64 is the most widely used (the only I've ever seen, in fact) + */ + +// 32bit #ifdef __WINDOWS__ - #if defined(__WIN16__) - #define wxInt16 int signed - #define wxUint16 int unsigned - #define wxInt32 long signed - #define wxUint32 long unsigned - #elif defined(__WIN32__) - #define wxInt16 short signed - #define wxUint16 short unsigned - #define wxInt32 int signed - #define wxUint32 int unsigned + #if defined(__WIN64__) + // you may remove this #error and try to compile the library, please + // report the results to wx-dev@lists.wxwindows.org if you do! + #error "wxWindows hasn't been tested under Win64, continue at your own risk" + + // the same definitions as for Win32 _should_ work here as only + // sizeof(void *) changes, but it must be tested first + #endif // __WIN64__ + + // Win64 uses LLP64 model and so ints and longs have the same size as in + // Win32 + #if defined(__WIN32__) + typedef int wxInt32; + typedef unsigned int wxUint32; + + // conside that if SIZEOF_INT is defined, all the other ones are too + #ifndef SIZEOF_INT + #define SIZEOF_INT 4 + #define SIZEOF_LONG 4 + #define SIZEOF_WCHAR_T 2 + + #define wxSIZE_T_IS_UINT + #undef wxSIZE_T_IS_ULONG + + #ifdef __WIN64__ + #define SIZEOF_INT_P 8 + #else // Win32 + #define SIZEOF_INT_P 4 + #endif // Win64/32 + #endif // !defined(SIZEOF_INT) #else - // Win64 will have different type sizes - #error "Please define a 32 bit type" + #error "Unsupported Windows version" #endif #else // !Windows - // SIZEOF_XXX are defined by configure - #if defined(SIZEOF_INT) && (SIZEOF_INT == 4) - #define wxInt16 short signed - #define wxUint16 short unsigned - #define wxInt32 int signed - #define wxUint32 int unsigned - #elif defined(SIZEOF_INT) && (SIZEOF_INT == 2) - #define wxInt16 int signed - #define wxUint16 int unsigned - #define wxInt32 long signed - #define wxUint32 long unsigned - #else - // assume sizeof(int) == 4 - what else can we do + // SIZEOF_XXX are normally defined by configure + #ifdef SIZEOF_INT + #if SIZEOF_INT == 8 + // must be ILP64 data model, there is normally a special 32 bit + // type in it but we don't know what it is... + #error "No 32bit int type on this platform" + #elif SIZEOF_INT == 4 + typedef int wxInt32; + typedef unsigned int wxUint32; + #elif SIZEOF_INT == 2 + // must be LP32 + #if SIZEOF_LONG != 4 + #error "No 32bit int type on this platform" + #endif + + typedef long wxInt32; + typedef unsigned long wxUint32; + #elif + // wxWindows is not ready for 128bit systems yet... + #error "Unknown sizeof(int) value, what are you compiling for?" + #endif + #else // !defined(SIZEOF_INT) + // assume sizeof(int) == 4 -- what else can we do? wxCOMPILE_TIME_ASSERT( sizeof(int) == 4, IntMustBeExactly4Bytes); - #define wxInt16 short signed - #define wxUint16 short unsigned - #define wxInt32 int signed - #define wxUint32 int unsigned + #define SIZEOF_INT 4 + + typedef int wxInt32; + typedef unsigned int wxUint32; + + #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T) + #define SIZEOF_WCHAR_T 4 + #endif + #if wxUSE_WCHAR_T && !defined(SIZEOF_WCHAR_T) + // also assume that sizeof(wchar_t) == 2 (under Unix the most + // common case is 4 but there configure would have defined + // SIZEOF_WCHAR_T for us) + // the most common case + wxCOMPILE_TIME_ASSERT( sizeof(wchar_t) == 2, + Wchar_tMustBeExactly2Bytes); + + #define SIZEOF_WCHAR_T 2 + #endif // wxUSE_WCHAR_T #endif #endif // Win/!Win +typedef wxUint32 wxDword; + + +// 64 bit + +// NB: we #define and not typedef wxLongLong_t because we want to be able to +// use 'unsigned wxLongLong_t' as well and because we use "#ifdef +// wxLongLong_t" in wx/longlong.h + +// to avoid compilation problems on 64bit machines with ambiguous method calls +// we will need to define this +#undef wxLongLongIsLong + +// first check for generic cases which are long on 64bit machine and "long +// long", then check for specific compilers #if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) -#define wxInt64 long signed -#define wxUint64 long unsigned -#elif defined(SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == 8) -#define wxInt64 long long signed -#define wxUint64 long long unsigned -#else // FIXME: what else can we do here aside from implementing wxULongLong -#define wxInt64 wxLongLong -#define wxUint64 wxULongLong + #define wxLongLong_t long + #define wxLongLongSuffix l + #define wxLongLongFmtSpec _T("l") + #define wxLongLongIsLong +#elif (defined(__VISUALC__) && defined(__WIN32__)) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 + #define wxLongLongFmtSpec _T("I64") +#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 + #define wxLongLongFmtSpec _T("Ld") +#elif (defined(__WATCOMC__) && defined(__WIN32__)) + #define wxLongLong_t __int64 + #define wxLongLongSuffix i64 + #define wxLongLongFmtSpec _T("Ld") +#elif defined(__DIGITALMARS__) + #define wxLongLong_t __int64 + #define wxLongLongSuffix LL + #define wxLongLongFmtSpec _T("ll") +#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ + defined(__MINGW32__) || \ + defined(__GNUC__) || \ + defined(__CYGWIN__) || \ + defined(__WXMICROWIN__) || \ + (defined(__DJGPP__) && __DJGPP__ >= 2) + #define wxLongLong_t long long + #define wxLongLongSuffix ll + #define wxLongLongFmtSpec _T("ll") +#elif defined(__MWERKS__) + #if __option(longlong) + #define wxLongLong_t long long + #define wxLongLongSuffix ll + #define wxLongLongFmtSpec _T("ll") + #else + #error "The 64 bit integer support in CodeWarrior has been disabled." + #error "See the documentation on the 'longlong' pragma." + #endif +#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 + #define wxLongLong_t long long +#endif + + +#ifdef wxLongLong_t + // these macros allow to definea 64 bit constants in a portable way + #define wxLL(x) wxCONCAT(x, wxLongLongSuffix) + #define wxULL(x) wxCONCAT(x, wxCONCAT(u, wxLongLongSuffix)) + + typedef wxLongLong_t wxInt64; + typedef unsigned wxLongLong_t wxUint64; #endif -#define wxByte wxUint8 -#define wxWord wxUint16 // base floating point types -// wxFloat32 : 32 bit IEEE float ( 1 sign , 8 exponent bits , 23 fraction bits -// wxFloat64 : 64 bit IEEE float ( 1 sign , 11 exponent bits , 52 fraction bits -// wxDouble : native fastest representation that has at least wxFloat64 -// precision, so use the IEEE types for storage , and this for calculations +// wxFloat32: 32 bit IEEE float ( 1 sign, 8 exponent bits, 23 fraction bits +// wxFloat64: 64 bit IEEE float ( 1 sign, 11 exponent bits, 52 fraction bits +// wxDouble: native fastest representation that has at least wxFloat64 +// precision, so use the IEEE types for storage, and this for +// calculations -typedef float wxFloat32 ; +typedef float wxFloat32; #if (defined( __WXMAC__ ) || defined(__WXCOCOA__)) && defined (__MWERKS__) typedef short double wxFloat64; #else @@ -762,7 +784,7 @@ typedef float wxFloat32 ; #if defined( __WXMAC__ ) && !defined( __POWERPC__ ) typedef long double wxDouble; #else - typedef double wxDouble ; + typedef double wxDouble; #endif // ---------------------------------------------------------------------------- @@ -787,13 +809,13 @@ typedef float wxFloat32 ; // assembler versions for these #ifdef __POWERPC__ inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i ) - {return (__lhbrx( &i , 0 ) ) ;} + {return (__lhbrx( &i , 0 ) );} inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i ) - {return (__lhbrx( &i , 0 ) ) ;} + {return (__lhbrx( &i , 0 ) );} inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i ) - {return (__lwbrx( &i , 0 ) ) ;} + {return (__lwbrx( &i , 0 ) );} inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i ) - {return (__lwbrx( &i , 0 ) ) ;} + {return (__lwbrx( &i , 0 ) );} #else #pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0) pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value) @@ -839,98 +861,74 @@ typedef float wxFloat32 ; #endif // machine specific byte swapping -#if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) -#define wxUINT64_SWAP_ALWAYS(val) \ - ((wxUint64) ( \ - (((wxUint64) (val) & (wxUint64) 0x00000000000000ffUL) << 56) | \ - (((wxUint64) (val) & (wxUint64) 0x000000000000ff00UL) << 40) | \ - (((wxUint64) (val) & (wxUint64) 0x0000000000ff0000UL) << 24) | \ - (((wxUint64) (val) & (wxUint64) 0x00000000ff000000UL) << 8) | \ - (((wxUint64) (val) & (wxUint64) 0x000000ff00000000UL) >> 8) | \ - (((wxUint64) (val) & (wxUint64) 0x0000ff0000000000UL) >> 24) | \ - (((wxUint64) (val) & (wxUint64) 0x00ff000000000000UL) >> 40) | \ - (((wxUint64) (val) & (wxUint64) 0xff00000000000000UL) >> 56))) - -#define wxINT64_SWAP_ALWAYS(val) \ - ((wxInt64) ( \ - (((wxUint64) (val) & (wxUint64) 0x00000000000000ffUL) << 56) | \ - (((wxUint64) (val) & (wxUint64) 0x000000000000ff00UL) << 40) | \ - (((wxUint64) (val) & (wxUint64) 0x0000000000ff0000UL) << 24) | \ - (((wxUint64) (val) & (wxUint64) 0x00000000ff000000UL) << 8) | \ - (((wxUint64) (val) & (wxUint64) 0x000000ff00000000UL) >> 8) | \ - (((wxUint64) (val) & (wxUint64) 0x0000ff0000000000UL) >> 24) | \ - (((wxUint64) (val) & (wxUint64) 0x00ff000000000000UL) >> 40) | \ - (((wxUint64) (val) & (wxUint64) 0xff00000000000000UL) >> 56))) - -#elif defined(SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == 8) -#define wxUINT64_SWAP_ALWAYS(val) \ - ((wxUint64) ( \ - (((wxUint64) (val) & (wxUint64) 0x00000000000000ffULL) << 56) | \ - (((wxUint64) (val) & (wxUint64) 0x000000000000ff00ULL) << 40) | \ - (((wxUint64) (val) & (wxUint64) 0x0000000000ff0000ULL) << 24) | \ - (((wxUint64) (val) & (wxUint64) 0x00000000ff000000ULL) << 8) | \ - (((wxUint64) (val) & (wxUint64) 0x000000ff00000000ULL) >> 8) | \ - (((wxUint64) (val) & (wxUint64) 0x0000ff0000000000ULL) >> 24) | \ - (((wxUint64) (val) & (wxUint64) 0x00ff000000000000ULL) >> 40) | \ - (((wxUint64) (val) & (wxUint64) 0xff00000000000000ULL) >> 56))) - -#define wxINT64_SWAP_ALWAYS(val) \ - ((wxInt64) ( \ - (((wxUint64) (val) & (wxUint64) 0x00000000000000ffULL) << 56) | \ - (((wxUint64) (val) & (wxUint64) 0x000000000000ff00ULL) << 40) | \ - (((wxUint64) (val) & (wxUint64) 0x0000000000ff0000ULL) << 24) | \ - (((wxUint64) (val) & (wxUint64) 0x00000000ff000000ULL) << 8) | \ - (((wxUint64) (val) & (wxUint64) 0x000000ff00000000ULL) >> 8) | \ - (((wxUint64) (val) & (wxUint64) 0x0000ff0000000000ULL) >> 24) | \ - (((wxUint64) (val) & (wxUint64) 0x00ff000000000000ULL) >> 40) | \ - (((wxUint64) (val) & (wxUint64) 0xff00000000000000ULL) >> 56))) - -#else -#define wxUINT64_SWAP_ALWAYS(val) \ - ((wxUint64) ( \ - ((wxULongLong(val) & wxULongLong(0L, 0x000000ffU)) << 56) | \ - ((wxULongLong(val) & wxULongLong(0L, 0x0000ff00U)) << 40) | \ - ((wxULongLong(val) & wxULongLong(0L, 0x00ff0000U)) << 24) | \ - ((wxULongLong(val) & wxULongLong(0L, 0xff000000U)) << 8) | \ - ((wxULongLong(val) & wxULongLong(0x000000ffL, 0U)) >> 8) | \ - ((wxULongLong(val) & wxULongLong(0x0000ff00L, 0U)) >> 24) | \ - ((wxULongLong(val) & wxULongLong(0x00ff0000L, 0U)) >> 40) | \ - ((wxULongLong(val) & wxULongLong(0xff000000L, 0U)) >> 56))) - -#define wxINT64_SWAP_ALWAYS(val) \ - ((wxInt64) ( \ - ((wxLongLong(val) & wxLongLong(0L, 0x000000ffU)) << 56) | \ - ((wxLongLong(val) & wxLongLong(0L, 0x0000ff00U)) << 40) | \ - ((wxLongLong(val) & wxLongLong(0L, 0x00ff0000U)) << 24) | \ - ((wxLongLong(val) & wxLongLong(0L, 0xff000000U)) << 8) | \ - ((wxLongLong(val) & wxLongLong(0x000000ffL, 0U)) >> 8) | \ - ((wxLongLong(val) & wxLongLong(0x0000ff00L, 0U)) >> 24) | \ - ((wxLongLong(val) & wxLongLong(0x00ff0000L, 0U)) >> 40) | \ - ((wxLongLong(val) & wxLongLong(0xff000000L, 0U)) >> 56))) -#endif +#ifdef wxLongLong_t + #define wxUINT64_SWAP_ALWAYS(val) \ + ((wxUint64) ( \ + (((wxUint64) (val) & (wxUint64) wxULL(0x00000000000000ff)) << 56) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x000000000000ff00)) << 40) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x0000000000ff0000)) << 24) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x00000000ff000000)) << 8) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x000000ff00000000)) >> 8) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x0000ff0000000000)) >> 24) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x00ff000000000000)) >> 40) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0xff00000000000000)) >> 56))) + + #define wxINT64_SWAP_ALWAYS(val) \ + ((wxInt64) ( \ + (((wxUint64) (val) & (wxUint64) wxULL(0x00000000000000ff)) << 56) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x000000000000ff00)) << 40) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x0000000000ff0000)) << 24) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x00000000ff000000)) << 8) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x000000ff00000000)) >> 8) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x0000ff0000000000)) >> 24) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0x00ff000000000000)) >> 40) | \ + (((wxUint64) (val) & (wxUint64) wxULL(0xff00000000000000)) >> 56))) +#else // !wxLongLong_t + #define wxUINT64_SWAP_ALWAYS(val) \ + ((wxUint64) ( \ + ((wxULongLong(val) & wxULongLong(0L, 0x000000ffU)) << 56) | \ + ((wxULongLong(val) & wxULongLong(0L, 0x0000ff00U)) << 40) | \ + ((wxULongLong(val) & wxULongLong(0L, 0x00ff0000U)) << 24) | \ + ((wxULongLong(val) & wxULongLong(0L, 0xff000000U)) << 8) | \ + ((wxULongLong(val) & wxULongLong(0x000000ffL, 0U)) >> 8) | \ + ((wxULongLong(val) & wxULongLong(0x0000ff00L, 0U)) >> 24) | \ + ((wxULongLong(val) & wxULongLong(0x00ff0000L, 0U)) >> 40) | \ + ((wxULongLong(val) & wxULongLong(0xff000000L, 0U)) >> 56))) + + #define wxINT64_SWAP_ALWAYS(val) \ + ((wxInt64) ( \ + ((wxLongLong(val) & wxLongLong(0L, 0x000000ffU)) << 56) | \ + ((wxLongLong(val) & wxLongLong(0L, 0x0000ff00U)) << 40) | \ + ((wxLongLong(val) & wxLongLong(0L, 0x00ff0000U)) << 24) | \ + ((wxLongLong(val) & wxLongLong(0L, 0xff000000U)) << 8) | \ + ((wxLongLong(val) & wxLongLong(0x000000ffL, 0U)) >> 8) | \ + ((wxLongLong(val) & wxLongLong(0x0000ff00L, 0U)) >> 24) | \ + ((wxLongLong(val) & wxLongLong(0x00ff0000L, 0U)) >> 40) | \ + ((wxLongLong(val) & wxLongLong(0xff000000L, 0U)) >> 56))) +#endif // wxLongLong_t/!wxLongLong_t #ifdef WORDS_BIGENDIAN - #define wxUINT16_SWAP_ON_BE(val) wxUINT16_SWAP_ALWAYS(val) - #define wxINT16_SWAP_ON_BE(val) wxINT16_SWAP_ALWAYS(val) - #define wxUINT16_SWAP_ON_LE(val) (val) - #define wxINT16_SWAP_ON_LE(val) (val) - #define wxUINT32_SWAP_ON_BE(val) wxUINT32_SWAP_ALWAYS(val) - #define wxINT32_SWAP_ON_BE(val) wxINT32_SWAP_ALWAYS(val) - #define wxUINT32_SWAP_ON_LE(val) (val) - #define wxINT32_SWAP_ON_LE(val) (val) - #define wxUINT64_SWAP_ON_BE(val) wxUINT64_SWAP_ALWAYS(val) - #define wxUINT64_SWAP_ON_LE(val) (val) + #define wxUINT16_SWAP_ON_BE(val) wxUINT16_SWAP_ALWAYS(val) + #define wxINT16_SWAP_ON_BE(val) wxINT16_SWAP_ALWAYS(val) + #define wxUINT16_SWAP_ON_LE(val) (val) + #define wxINT16_SWAP_ON_LE(val) (val) + #define wxUINT32_SWAP_ON_BE(val) wxUINT32_SWAP_ALWAYS(val) + #define wxINT32_SWAP_ON_BE(val) wxINT32_SWAP_ALWAYS(val) + #define wxUINT32_SWAP_ON_LE(val) (val) + #define wxINT32_SWAP_ON_LE(val) (val) + #define wxUINT64_SWAP_ON_BE(val) wxUINT64_SWAP_ALWAYS(val) + #define wxUINT64_SWAP_ON_LE(val) (val) #else - #define wxUINT16_SWAP_ON_LE(val) wxUINT16_SWAP_ALWAYS(val) - #define wxINT16_SWAP_ON_LE(val) wxINT16_SWAP_ALWAYS(val) - #define wxUINT16_SWAP_ON_BE(val) (val) - #define wxINT16_SWAP_ON_BE(val) (val) - #define wxUINT32_SWAP_ON_LE(val) wxUINT32_SWAP_ALWAYS(val) - #define wxINT32_SWAP_ON_LE(val) wxINT32_SWAP_ALWAYS(val) - #define wxUINT32_SWAP_ON_BE(val) (val) - #define wxINT32_SWAP_ON_BE(val) (val) - #define wxUINT64_SWAP_ON_LE(val) wxUINT64_SWAP_ALWAYS(val) - #define wxUINT64_SWAP_ON_BE(val) (val) + #define wxUINT16_SWAP_ON_LE(val) wxUINT16_SWAP_ALWAYS(val) + #define wxINT16_SWAP_ON_LE(val) wxINT16_SWAP_ALWAYS(val) + #define wxUINT16_SWAP_ON_BE(val) (val) + #define wxINT16_SWAP_ON_BE(val) (val) + #define wxUINT32_SWAP_ON_LE(val) wxUINT32_SWAP_ALWAYS(val) + #define wxINT32_SWAP_ON_LE(val) wxINT32_SWAP_ALWAYS(val) + #define wxUINT32_SWAP_ON_BE(val) (val) + #define wxINT32_SWAP_ON_BE(val) (val) + #define wxUINT64_SWAP_ON_LE(val) wxUINT64_SWAP_ALWAYS(val) + #define wxUINT64_SWAP_ON_BE(val) (val) #endif // Macros to convert from unsigned long to void pointer. @@ -1096,9 +1094,15 @@ enum wxBorder // mouse is clicked outside of it or if it loses focus in any other way #define wxPOPUP_WINDOW 0x00020000 +// force a full repaint when the window is resized (instead of repainting just +// the invalidated area) +#define wxFULL_REPAINT_ON_RESIZE 0x00010000 + +// obsolete: now this is the default behaviour +// // don't invalidate the whole window (resulting in a PAINT event) when the // window is resized (currently, makes sense for wxMSW only) -#define wxNO_FULL_REPAINT_ON_RESIZE 0x00010000 +#define wxNO_FULL_REPAINT_ON_RESIZE 0 /* * Extra window style flags (use wxWS_EX prefix to make it clear that they @@ -1266,15 +1270,6 @@ enum wxBorder #define wxRB_GROUP 0x0004 #define wxRB_SINGLE 0x0008 -/* - * wxGauge flags - */ -#define wxGA_HORIZONTAL wxHORIZONTAL -#define wxGA_VERTICAL wxVERTICAL -#define wxGA_PROGRESSBAR 0x0010 -// Windows only -#define wxGA_SMOOTH 0x0020 - /* * wxSlider flags */ @@ -1446,6 +1441,7 @@ enum wxID_HELP_PROCEDURES, wxID_HELP_CONTEXT, wxID_CLOSE_ALL, + wxID_PREFERENCES , wxID_CUT = 5030, wxID_COPY, @@ -1996,26 +1992,26 @@ enum wxUpdateUI typedef unsigned char WXCOLORREF[6]; typedef void* WXHBITMAP; -typedef void* WXHMETAFILE ; -typedef void* WXHICON ; -typedef void* WXHCURSOR ; -typedef void* WXHRGN ; -typedef void* WXRECTPTR ; -typedef void* WXPOINTPTR ; -typedef void* WXHWND ; -typedef void* WXEVENTREF ; -typedef void* WXEVENTHANDLERREF ; -typedef void* WXEVENTHANDLERCALLREF ; -typedef void* WXAPPLEEVENTREF ; -typedef void* WXHDC ; -typedef void* WXHMENU ; +typedef void* WXHMETAFILE; +typedef void* WXHICON; +typedef void* WXHCURSOR; +typedef void* WXHRGN; +typedef void* WXRECTPTR; +typedef void* WXPOINTPTR; +typedef void* WXHWND; +typedef void* WXEVENTREF; +typedef void* WXEVENTHANDLERREF; +typedef void* WXEVENTHANDLERCALLREF; +typedef void* WXAPPLEEVENTREF; +typedef void* WXHDC; +typedef void* WXHMENU; typedef unsigned int WXUINT; typedef unsigned long WXDWORD; typedef unsigned short WXWORD; -typedef void* WXWidget ; -typedef void* WXWindow ; -typedef void* WXDisplay ; +typedef void* WXWidget; +typedef void* WXWindow; +typedef void* WXDisplay; /* typedef WindowPtr WXHWND; typedef Handle WXHANDLE; @@ -2051,7 +2047,7 @@ typedef ControlHandle WXWidget; #ifdef __WXCOCOA__ // NOTE: This ought to work with other compilers too, but I'm being cautious -#if defined(__GNUC__) && defined(__APPLE__) +#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__) /* It's desirable to have type safety for Objective-C(++) code as it does at least catch typos of method names among other things. However, it is not possible to declare an Objective-C class from plain old C or C++ @@ -2071,7 +2067,7 @@ typedef klass *WX_##klass typedef struct klass *WX_##klass #endif // defined(__OBJC__) -#else // not GNU +#else // not Apple's GNU or CodeWarrior #warning "Objective-C types will not be checked by the compiler." // NOTE: typedef struct objc_object *id; // IOW, we're declaring these using the id type without using that name, @@ -2081,7 +2077,7 @@ typedef struct klass *WX_##klass #define DECLARE_WXCOCOA_OBJC_CLASS(klass) \ typedef struct objc_object *WX_##klass -#endif // defined(__GNUC__) && defined(__APPLE__) +#endif // (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__) DECLARE_WXCOCOA_OBJC_CLASS(NSApplication); DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep); @@ -2095,6 +2091,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager); DECLARE_WXCOCOA_OBJC_CLASS(NSMenu); DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem); DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray); +DECLARE_WXCOCOA_OBJC_CLASS(NSNotification); DECLARE_WXCOCOA_OBJC_CLASS(NSPanel); DECLARE_WXCOCOA_OBJC_CLASS(NSScrollView); DECLARE_WXCOCOA_OBJC_CLASS(NSTableColumn);