compilation fixes for --disable-log

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/log.h b/include/wx/log.h
index 0ed1ddbc629d3d4cd537f79a71e85584971bb38f..85c09841d180569e26316ae3a0f3a6387e29784f 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -471,13 +471,6 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
 // define wxLog<level>
 // ----------------------------------------------------------------------------
 
 // define wxLog<level>
 // ----------------------------------------------------------------------------
 

-#ifdef __WATCOMC__
-    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    #define WX_WATCOM_ONLY_CODE( x )  x
-#else
-    #define WX_WATCOM_ONLY_CODE( x )
-#endif
-

 #define DECLARE_LOG_FUNCTION(level)                                         \
     extern void WXDLLIMPEXP_BASE                                            \
     wxDoLog##level(const wxString& format, ...);                            \
 #define DECLARE_LOG_FUNCTION(level)                                         \
     extern void WXDLLIMPEXP_BASE                                            \
     wxDoLog##level(const wxString& format, ...);                            \


@@ -535,6 +528,13 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
 
 #else // !wxUSE_LOG
 
 
 #else // !wxUSE_LOG
 

+#ifdef __WATCOMC__
+    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
+    #define WX_WATCOM_ONLY_CODE( x )  x
+#else
+    #define WX_WATCOM_ONLY_CODE( x )
+#endif
+

 // log functions do nothing at all
 #define DECLARE_LOG_FUNCTION(level)                                         \
     WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wxString&))           \
 // log functions do nothing at all
 #define DECLARE_LOG_FUNCTION(level)                                         \
     WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wxString&))           \


@@ -557,8 +557,6 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
                                const wxString& WXUNUSED(format),            \
                                va_list WXUNUSED(argptr)) {}
 
                                const wxString& WXUNUSED(format),            \
                                va_list WXUNUSED(argptr)) {}
 

-#undef WX_WATCOM_ONLY_CODE
-

 // Empty Class to fake wxLogNull
 class WXDLLIMPEXP_BASE wxLogNull
 {
 // Empty Class to fake wxLogNull
 class WXDLLIMPEXP_BASE wxLogNull
 {


@@ -715,5 +713,9 @@ wxSafeShowMessage(const wxString& title, const wxString& text);
 #include "wx/cocoa/log.h"
 #endif
 
 #include "wx/cocoa/log.h"
 #endif
 

+#ifdef WX_WATCOM_ONLY_CODE
+    #undef WX_WATCOM_ONLY_CODE
+#endif
+

 #endif  // _WX_LOG_H_
 
 #endif  // _WX_LOG_H_
 

diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h
index 1077ac301f423d3f177d72c4a23a9dc349ead05c..7c523e892d24b2de0eb844b4c7cd8a0c23958979 100644 (file)
--- a/include/wx/strvararg.h
+++ b/include/wx/strvararg.h
@@ -105,7 +105,7 @@ class WXDLLIMPEXP_BASE wxString;
         _WX_VARARG_DEFINE_FUNC_NOP_N0(name, numfixed, fixed)                  \
         _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                  \
                         _WX_VARARG_DEFINE_FUNC_NOP,                           \
         _WX_VARARG_DEFINE_FUNC_NOP_N0(name, numfixed, fixed)                  \
         _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                  \
                         _WX_VARARG_DEFINE_FUNC_NOP,                           \

-                        void, name, dummy, numfixed, fixed)
+                        void, name, dummy, dummy, numfixed, fixed)

 
 // Like WX_DEFINE_VARARG_FUNC_CTOR, but for defining template constructors
 #define WX_DEFINE_VARARG_FUNC_CTOR(name, numfixed, fixed, impl)               \
 
 // Like WX_DEFINE_VARARG_FUNC_CTOR, but for defining template constructors
 #define WX_DEFINE_VARARG_FUNC_CTOR(name, numfixed, fixed, impl)               \