Renamed UpdateWindowMenuBar to UpdateMenuBar and removed unused parameter

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index c5ad6d54d9a7c95d6f6e1e812328da572848cd19..d4c2f5005876ca6127ad6bd5efb187902c492f42 100644 (file)
--- 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
 
 // 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 <class T>
 inline void wxUnusedVar(const T& WXUNUSED(t)) { }
 template <class T>
 inline void wxUnusedVar(const T& WXUNUSED(t)) { }

+#endif

 
 // ----------------------------------------------------------------------------
 // compiler specific settings
 
 // ----------------------------------------------------------------------------
 // compiler specific settings


@@ -678,7 +682,7 @@ typedef wxUint16 wxWord;
         typedef int wxInt32;
         typedef unsigned int wxUint32;
 
         typedef int wxInt32;
         typedef unsigned int wxUint32;
 

-               #if defined (__MWERKS__) && defined(__MACH__)
+               #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T)

                        #define SIZEOF_WCHAR_T 4
                #endif
         #if wxUSE_WCHAR_T && !defined(SIZEOF_WCHAR_T)
                        #define SIZEOF_WCHAR_T 4
                #endif
         #if wxUSE_WCHAR_T && !defined(SIZEOF_WCHAR_T)