X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/618a5e382af2e469f9cc9d2aa81114403637a4b3..a7910d97a37c967ee47813f9e3af33b1525d1269:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 4f9855a832..160d4b82f7 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -20,182 +20,21 @@ // compiler and OS identification // ---------------------------------------------------------------------------- -// first define Windows symbols if they're not defined on the command line: we -// can autodetect everything we need if _WIN32 is defined -#if defined(_WIN32) || defined(WIN32) || defined(__NT__) - #ifndef __WXMSW__ - #define __WXMSW__ - #endif - - #ifndef __WIN32__ - #define __WIN32__ - #endif +#include "wx/platform.h" - // Win95 means Win95-style UI, i.e. Win9x/NT 4+ - #if !defined(__WIN95__) && defined(WINVER) && (WINVER >= 0x0400) - #define __WIN95__ - #endif -#endif // Win32 - -#if defined(__WXMSW__) || defined(__WIN32__) - #if !defined(__WINDOWS__) - #define __WINDOWS__ - #endif -#endif - -#ifdef __WXWINE__ - #ifndef __WIN32__ - #define __WIN32__ - #endif - #ifndef __WIN95__ - #define __WIN95__ - #endif - #ifndef STRICT - #define STRICT - #endif -#endif // WINE - -#if defined(TWIN32) && !defined(__TWIN32__) - #define __TWIN32__ -#endif // Twin32 - -#include "wx/setup.h" - -// old C++ headers (like ) declare classes in the global namespace -// while the new, standard ones (like ) do it in std:: namespace -// -// using this macro allows constuctions like "wxSTD iostream" to work in -// either case -#if !wxUSE_IOSTREAMH - #define wxSTD std:: -#else - #define wxSTD -#endif - -// just in case they were defined in setup.h -#ifdef PACKAGE -#undef PACKAGE -#endif - -#ifdef VERSION -#undef VERSION +// Make sure the environment is set correctly +#if defined(__WXMSW__) && defined(__X__) + #error "Target can't be both X and Windows" +#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \ + !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \ + !defined(__WXMGL__) && wxUSE_GUI + #ifdef __UNIX__ + #error "No Target! You should use wx-config program for compilation flags!" + #else // !Unix + #error "No Target! You should use supplied makefiles for compilation!" + #endif // Unix/!Unix #endif -// OS: first test for generic Unix defines, then for particular flavours and -// finally for Unix-like systems -#if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \ - defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \ - defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \ - defined(__EMX__) || defined(__VMS) || defined(__BEOS__) - - #define __UNIX_LIKE__ - - // Helps SGI compilation, apparently - #ifdef __SGI__ - #ifdef __GNUG__ - #define __need_wchar_t - #else // !gcc - // Note I use the term __SGI_CC__ for both cc and CC, its not a good - // idea to mix gcc and cc/CC, the name mangling is different - #define __SGI_CC__ - #endif // gcc/!gcc - #endif // SGI - - #if defined(sun) || defined(__SUN__) - #ifndef __GNUG__ - #ifndef __SUNCC__ - #define __SUNCC__ - #endif // Sun CC - #endif - #endif // Sun - - #ifdef __EMX__ - #define OS2EMX_PLAIN_CHAR - #endif - - // define __HPUX__ for HP-UX where standard macro is __hpux - #if defined(__hpux) && !defined(__HPUX__) - #define __HPUX__ - #endif // HP-UX - - #if defined(__WXMAC__) && defined(__DARWIN__) - // Mac OS X - - // Some code has been added to workaround defects(?) in the - // bundled gcc compiler. These corrections are identified by: - // __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif) - - #include - #endif // __WXMAC__ && __DARWIN__ -#elif defined(applec) || \ - defined(THINK_C) || \ - (defined(__MWERKS__) && !defined(__INTEL__)) - // MacOS -#elif defined(__WXMAC__) && defined(__DARWIN__) - // Mac OS X - #define __UNIX_LIKE__ - - // Some code has been added to workaround defects(?) in the - // bundled gcc compiler. These corrections are identified by: - // __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif) - - #include -#elif defined(__OS2__) - #if defined(__IBMCPP__) - #define __VISAGEAVER__ __IBMCPP__ - #endif - #ifndef __WXOS2__ - #define __WXOS2__ - #endif - #ifndef __WXPM__ - #define __WXPM__ - #endif - - // Place other OS/2 compiler environment defines here - #if defined(__VISAGECPP__) - // VisualAge is the only thing that understands _Optlink - #define LINKAGEMODE _Optlink - #endif - #define wxSIZE_T_IS_UINT -#else // Windows - #ifndef __WINDOWS__ - #define __WINDOWS__ - #endif // Windows - - // to be changed for Win64! - #ifndef __WIN32__ - #define __WIN16__ - #endif - - // define another standard symbol for Microsoft Visual C++: the standard one - // (_MSC_VER) is also defined by Metrowerks compiler - #if defined(_MSC_VER) && !defined(__MWERKS__) - #define __VISUALC__ _MSC_VER - #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__) - #define __BORLANDC__ - #elif defined(__WATCOMC__) - #elif defined(__SC__) - #define __SYMANTECC__ - #endif // compiler - - // size_t is the same as unsigned int for all Windows compilers we know, - // so define it if it hadn't been done by configure yet - #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) - #define wxSIZE_T_IS_UINT - #endif -#endif // OS - -// if we're on a Unix system but didn't use configure (so that setup.h didn't -// define __UNIX__), do define __UNIX__ now -#if !defined(__UNIX__) && defined(__UNIX_LIKE__) - #define __UNIX__ -#endif // Unix - -// LINKAGEMODE mode is empty for everyting except OS/2 -#ifndef LINKAGEMODE - #define LINKAGEMODE -#endif // LINKAGEMODE - // suppress some Visual C++ warnings #ifdef __VISUALC__ # pragma warning(disable:4201) // nonstandard extension used: nameless struct/union @@ -216,8 +55,8 @@ // suppress some Watcom C++ warnings #ifdef __WATCOMC__ -# pragma warning 849 9 // Disable 'virtual function hidden' -# pragma warning 549 9 // Disable 'operand contains compiler generated information' +# pragma warning 849 9 // Disable 'virtual function hidden' +# pragma warning 549 9 // Disable 'operand contains compiler generated information' #endif // __VISUALC__ // suppress some Salford C++ warnings @@ -229,64 +68,12 @@ # pragma suppress 571 // Virtual function hiding #endif // __SALFORDC__ -#if defined(__VISUALC__) && !defined(WIN32) - // VC1.5 does not have LPTSTR type - #define LPTSTR LPSTR - #define LPCTSTR LPCSTR -#endif // VC++ 1.5 - -// Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files, -// so define it ourselves (newer versions do it for all files, though, and -// don't allow it to be redefined) -#ifdef __DECCXX - #if !defined(__VMS) && !defined(__cplusplus) - #define __cplusplus - #endif -#endif // __DECCXX - -// Resolves linking problems under HP-UX -#if defined(__HPUX__) && defined(__GNUG__) - #define va_list __gnuc_va_list -#endif // HP-UX - -// This macro can be used to check that the version of mingw32 compiler is -// at least maj.min -#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ ) - #include "wx/msw/gccpriv.h" -#else - #undef wxCHECK_W32API_VERSION - #define wxCHECK_W32API_VERSION(maj, min) (0) -#endif - -#if defined(__HPUX__) && !defined(__WXGTK__) - #ifndef __WXMOTIF__ - #define __WXMOTIF__ - #endif // __WXMOTIF__ -#endif - -#if defined(__WXMOTIF__) - #define __X__ -#endif - -// Make sure the environment is set correctly -#if defined(__WXMSW__) && defined(__X__) - #error "Target can't be both X and Windows" -#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \ - !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \ - !defined(__WXQT__) && !defined(__WXMGL__) && wxUSE_GUI - #ifdef __UNIX__ - #error "No Target! You should use wx-config program for compilation flags!" - #else // !Unix - #error "No Target! You should use supplied makefiles for compilation!" - #endif // Unix/!Unix -#endif - -#include "wx/version.h" - // ---------------------------------------------------------------------------- -// compatibility defines +// wxWindows version and compatibility defines // ---------------------------------------------------------------------------- +#include "wx/version.h" + // possibility to build non GUI apps is new, so don't burden ourselves with // compatibility code #if !wxUSE_GUI @@ -301,6 +88,32 @@ // non portable C++ features // ============================================================================ +// ---------------------------------------------------------------------------- +// compiler defects workarounds +// ---------------------------------------------------------------------------- + +#if defined(__VISUALC__) && !defined(WIN32) + // VC1.5 does not have LPTSTR type + #define LPTSTR LPSTR + #define LPCTSTR LPCSTR +#endif // VC++ 1.5 + +/* + Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files, + so define it ourselves (newer versions do it for all files, though, and + don't allow it to be redefined) + */ +#ifdef __DECCXX + #if !defined(__VMS) && !defined(__cplusplus) + #define __cplusplus + #endif +#endif /* __DECCXX */ + +// Resolves linking problems under HP-UX when compiling with gcc/g++ +#if defined(__HPUX__) && defined(__GNUG__) + #define va_list __gnuc_va_list +#endif // HP-UX + // ---------------------------------------------------------------------------- // check for native bool type and TRUE/FALSE constants // ---------------------------------------------------------------------------- @@ -369,20 +182,6 @@ typedef short int WXTYPE; // because -1 is a valid (and largely used) value for window id. typedef int wxWindowID; -// 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 - // ---------------------------------------------------------------------------- // portable calling conventions macros // ---------------------------------------------------------------------------- @@ -401,6 +200,11 @@ typedef int wxWindowID; #define wxSTDCALL #endif // platform +// LINKAGEMODE mode is empty for everyting except OS/2 +#ifndef LINKAGEMODE + #define LINKAGEMODE +#endif // LINKAGEMODE + // wxCALLBACK should be used for the functions which are called back by // Windows (such as compare function for wxListCtrl) #if defined(__WIN32__) && !defined(__WXMICROWIN__) @@ -428,62 +232,48 @@ typedef int wxWindowID; // ---------------------------------------------------------------------------- #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__) -# ifdef WXMAKINGDLL -# define WXDLLEXPORT __declspec( dllexport ) -# define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type -# define WXDLLEXPORT_CTORFN -# elif defined(WXUSINGDLL) -# define WXDLLEXPORT __declspec( dllimport ) -# define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type -# define WXDLLEXPORT_CTORFN -# else -# define WXDLLEXPORT -# define WXDLLEXPORT_DATA(type) type -# define WXDLLEXPORT_CTORFN -# endif -#else -# define WXDLLEXPORT -# define WXDLLEXPORT_DATA(type) type -# define WXDLLEXPORT_CTORFN -#endif - + // __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 +#endif -# if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ))) - -# ifdef WXMAKINGDLL -# define WXDLLEXPORT _Export -# define WXDLLEXPORT_DATA(type) _Export type -# define WXDLLEXPORT_CTORFN -# elif defined(WXUSINGDLL) -# define WXDLLEXPORT _Export -# define WXDLLEXPORT_DATA(type) _Export type -# define WXDLLEXPORT_CTORFN -# else -# define WXDLLEXPORT -# define WXDLLEXPORT_DATA(type) type -# define WXDLLEXPORT_CTORFN -# endif - -# else - -# define WXDLLEXPORT -# define WXDLLEXPORT_DATA(type) type -# define WXDLLEXPORT_CTORFN - -# endif - -#else // !(MSW or OS2) - -# define WXDLLEXPORT -# define WXDLLEXPORT_DATA(type) type -# define WXDLLEXPORT_CTORFN - +// for other platforms/compilers we don't anything +#ifndef WXEXPORT + #define WXEXPORT + #define WXIMPORT #endif +// 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 DLL +#ifdef WXMAKINGDLL + #define WXDLLEXPORT WXEXPORT + #define WXDLLEXPORT_DATA(type) WXEXPORT type + #define WXDLLEXPORT_CTORFN +#elif defined(WXUSINGDLL) + #define WXDLLEXPORT WXIMPORT + #define WXDLLEXPORT_DATA(type) WXIMPORT type + #define WXDLLEXPORT_CTORFN +#else // not making nor using DLL + #define WXDLLEXPORT + #define WXDLLEXPORT_DATA(type) type + #define WXDLLEXPORT_CTORFN +#endif // For ostream, istream ofstream #if defined(__BORLANDC__) && defined( _RTLDLL ) @@ -497,8 +287,8 @@ class WXDLLEXPORT wxObject; class WXDLLEXPORT wxEvent; #endif - /** symbolic constant used by all Find()-like functions returning positive - integer on success as failure indicator */ +// symbolic constant used by all Find()-like functions returning positive +// integer on success as failure indicator #define wxNOT_FOUND (-1) // ---------------------------------------------------------------------------- @@ -510,38 +300,36 @@ class WXDLLEXPORT wxEvent; #include "wx/debug.h" #endif -// NULL declaration +// 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 -//@{ -/// delete pointer if it is not NULL and NULL it afterwards +// 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 // be considered as an error by some overzealous debugging implementations of // the library, so we do it ourselves) -#if defined(__SGI_CC__) -// Okay this is bad styling, but the native SGI compiler is very picky, it -// wont let you compare/assign between a NULL (void *) and another pointer -// type. To be really clean we'd need to pass in another argument, the type -// of p. -// Also note the use of 0L, this would allow future possible 64bit support -// (as yet untested) by ensuring that we zero all the bits in a pointer -// (which is always the same length as a long (at least with the LP64 standard) -// --- offer aug 98 -#define wxDELETE(p) if ( (p) ) { delete (p); p = 0L; } -#else #define wxDELETE(p) if ( (p) != NULL ) { delete p; p = NULL; } -#endif /* __SGI__CC__ */ // delete an array and NULL it (see comments above) -#if defined(__SGI_CC__) -// see above comment. -#define wxDELETEA(p) if ( (p) ) { delete [] (p); p = 0L; } -#else -#define wxDELETEA(p) if ( ((void *) (p)) != NULL ) { delete [] p; p = NULL; } -#endif /* __SGI__CC__ */ +#define wxDELETEA(p) if ( (p) ) { delete [] (p); p = NULL; } -/// size of statically declared array +// size of statically declared array #define WXSIZEOF(array) (sizeof(array)/sizeof(array[0])) // ---------------------------------------------------------------------------- @@ -597,13 +385,13 @@ enum wxMOTIF_X, // OSF Motif 1.x.x wxCOSE_X, // OSF Common Desktop Environment wxNEXTSTEP, // NeXTStep - wxMACINTOSH, // Apple System 7 and 8 + wxMAC, // Apple Mac OS 8/9/X with Mac paths + wxMAC_DARWIN, // Apple Mac OS X with Unix paths wxBEOS, // BeOS wxGTK, // GTK on X wxGTK_WIN32, // GTK on Win32 wxGTK_OS2, // GTK on OS/2 wxGTK_BEOS, // GTK on BeOS - wxQT, // Qt wxGEOS, // GEOS wxOS2_PM, // OS/2 Workplace wxWINDOWS, // Windows or WfW @@ -984,6 +772,13 @@ enum wxBorder // descend into all subwindows #define wxWS_EX_VALIDATE_RECURSIVELY 0x00000001 +// wxCommandEvents and the objects of the derived classes are forwarded to the +// parent window and so on recursively by default. Using this flag for the +// given window allows to block this propagation at this window, i.e. prevent +// the events from being propagated further upwards. The dialogs have this +// flag on by default. +#define wxWS_EX_BLOCK_EVENTS 0x00000002 + /* * wxFrame/wxDialog style flags */ @@ -1099,15 +894,9 @@ enum wxBorder // always show an entire number of rows #define wxLB_INT_HEIGHT 0x0800 -// use wxHSCROLL to not wrap text at all, wxTE_LINEWRAP to wrap it at any -// position and wxTE_WORDWRAP to wrap at words boundary -#define wxTE_DONTWRAP wxHSCROLL -#define wxTE_LINEWRAP 0x0800 -#define wxTE_WORDWRAP 0x0000 // it's just == !wxHSCROLL - // deprecated synonyms -#define wxPROCESS_ENTER wxTE_PROCESS_ENTER -#define wxPASSWORD wxTE_PASSWORD +#define wxPROCESS_ENTER 0x0400 // wxTE_PROCESS_ENTER +#define wxPASSWORD 0x0800 // wxTE_PASSWORD /* * wxComboBox style flags @@ -1252,15 +1041,6 @@ enum wxBorder #define wxHW_SCROLLBAR_NEVER 0x0002 #define wxHW_SCROLLBAR_AUTO 0x0004 -/* - * wxCalendarCtrl flags - */ -#define wxCAL_SUNDAY_FIRST 0x0000 -#define wxCAL_MONDAY_FIRST 0x0001 -#define wxCAL_SHOW_HOLIDAYS 0x0002 -#define wxCAL_NO_YEAR_CHANGE 0x0004 -#define wxCAL_NO_MONTH_CHANGE 0x000c // no month change => no year change - /* * extended dialog specifiers. these values are stored in a different * flag and thus do not overlap with other style flags. note that these @@ -1269,13 +1049,14 @@ enum wxBorder */ // wxCENTRE already defined as 0x00000001 +#define wxYES 0x00000002 #define wxOK 0x00000004 -#define wxYES_NO 0x00000008 +#define wxNO 0x00000008 +#define wxYES_NO (wxYES | wxNO) #define wxCANCEL 0x00000010 -#define wxYES 0x00000020 -#define wxNO 0x00000040 + +#define wxYES_DEFAULT 0x00000000 // has no effect (default) #define wxNO_DEFAULT 0x00000080 -#define wxYES_DEFAULT 0x00000000 // has no effect #define wxICON_EXCLAMATION 0x00000100 #define wxICON_HAND 0x00000200 @@ -1909,7 +1690,10 @@ typedef unsigned short WORD; // WIN32 graphics types for OS/2 GPI // RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def -#define OS2RGB(r,g,b) ((DWORD ((BYTE) (b) | ((WORD) (g) << 8)) | (((DWORD)(BYTE)(r)) << 16))) +// WARNING: The OS/2 headers typedef BYTE simply as 'char'; if the default is signed, all +// hell will break loose! +//#define OS2RGB(r,g,b) ((DWORD ((BYTE) (b) | ((WORD) (g) << 8)) | (((DWORD)(BYTE)(r)) << 16))) +#define OS2RGB(r,g,b) ((DWORD)((unsigned char)(b) | ((unsigned char)(g) << 8)) | ((unsigned char)(r) << 16)) typedef unsigned long COLORREF; #define GetBValue(rgb) ((BYTE)((rgb) >> 16)) @@ -1938,7 +1722,7 @@ typedef struct tagLOGPALETTE #elif defined(__WIN32__) typedef int (__stdcall *WXFARPROC)(); #elif defined(__WXPM__) -# if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 ) +# if (defined(__VISAGECPP__) && (__IBMCPP__ < 400)) || defined (__WATCOMC__) // VA 3.0 for some reason needs base data types when typedefing a proc proto??? typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*); # else @@ -2044,7 +1828,7 @@ typedef struct _PangoFontDescription PangoFontDescription; #endif // GTK #ifdef __WXMGL__ -typedef void *WXWidget; // FIXME_MGL - type-safe +typedef struct window_t *WXWidget; #endif // MGL // This is required because of clashing macros in windows.h, which may be