Patch #826420, and also adapted to new SWIG

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f1fe077816eb6e5c698d7cce371c00946e246510..4929dec125feef80abbd7b7766485e1eae1be21b 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -457,7 +457,7 @@ 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 <typename T>
+template <class T>
 inline void wxUnusedVar(const T& WXUNUSED(t)) { }
 
 // ----------------------------------------------------------------------------
@@ -678,6 +678,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
@@ -711,7 +714,7 @@ typedef wxUint32 wxDword;
     #define wxLongLongSuffix l
     #define wxLongLongFmtSpec _T("l")
     #define wxLongLongIsLong
-#elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ ) 
+#elif (defined(__VISUALC__) && defined(__WIN32__)) 
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec _T("I64")