X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5b100ac63c6820b57a48994006de7250bdb8c2..715c1da4a738567ac5ca05b369bb857ef6fb4b8c:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 06cc68c766..d4c2f50058 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -457,8 +457,12 @@ typedef int wxWindowID; // sometimes the value of a variable is *really* not used, to suppress the // resulting warning you may pass it to this function -template +#ifdef __BORLANDC__ +#define wxUnusedVar(identifier) identifier +#else +template inline void wxUnusedVar(const T& WXUNUSED(t)) { } +#endif // ---------------------------------------------------------------------------- // compiler specific settings @@ -678,6 +682,9 @@ typedef wxUint16 wxWord; 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