Reconcile HAVE_VARIADIC_MACROS and wxHAS_VARIADIC_MACROS definitions.

The main user-visible effect of this change is that giving configure
--disable-vararg-macros argument now really disables the use of variadic
macros whereas it didn't disable them in wx/cpp.h before.

It is, of course, also less confusing to not have two very similar but
different symbols.

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

diff --git a/configure b/configure
index ccdb05d259ec20b1f79d06e4d7ecff2b8f0db17b..90f437239a1f5688eb973915f394f0f0dd1dde92 100755 (executable)
--- a/configure
+++ b/configure
@@ -20816,6 +20816,9 @@ if test $wx_cv_have_variadic_macros = "yes"; then
 
 fi
 
+else
+    $as_echo "#define wxNO_VARIADIC_MACROS 1" >>confdefs.h
+
 fi
 
 LARGEFILE_CPPFLAGS=

diff --git a/configure.in b/configure.in
index e87b56cfcc21116e94204043d19b406dc628701f..68edc08835010646b71aaefb1abe6def3fe731c0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1767,6 +1767,8 @@ if test $wx_cv_have_variadic_macros = "yes"; then
     AC_DEFINE(HAVE_VARIADIC_MACROS)
 fi
 
+else
+    AC_DEFINE(wxNO_VARIADIC_MACROS)
 fi dnl wxUSE_VARARG_MACROS == yes
 
 

diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index 9fed106a76b2cb06174367aa518bbf53fddad057..f8b1d2ef58d521d3c9eecb0e80937a066d62a18b 100644 (file)
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -124,16 +124,24 @@
 #endif /* __WXFUNCTION__ already defined */
 
 
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-    (defined(__cplusplus) && __cplusplus >= 201103L)
-    #define wxHAS_VARIADIC_MACROS
-#elif defined(__GNUC__) && __GNUC__ >= 3
-    #define wxHAS_VARIADIC_MACROS
-#elif defined(_MSC_VER) && _MSC_VER >= 1400
-    #define wxHAS_VARIADIC_MACROS
-#endif
+/* Auto-detect variadic macros support unless explicitly disabled. */
+#if !defined(HAVE_VARIADIC_MACROS) && !defined(wxNO_VARIADIC_MACROS)
+    /* Any C99 or C++11 compiler should have them. */
+    #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+        (defined(__cplusplus) && __cplusplus >= 201103L)
+        #define HAVE_VARIADIC_MACROS
+    #elif defined(__GNUC__) && __GNUC__ >= 3
+        #define HAVE_VARIADIC_MACROS
+    #elif wxCHECK_VISUALC_VERSION(8)
+        #define HAVE_VARIADIC_MACROS
+    #elif wxCHECK_WATCOM_VERSION(1,2)
+        #define HAVE_VARIADIC_MACROS
+    #endif
+#endif /* !HAVE_VARIADIC_MACROS */
+
+
 
-#ifdef wxHAS_VARIADIC_MACROS
+#ifdef HAVE_VARIADIC_MACROS
 /*
    wxCALL_FOR_EACH(what, ...) calls the macro from its first argument, what(pos, x),
    for every remaining argument 'x', with 'pos' being its 1-based index in
@@ -172,7 +180,7 @@
 
 #else
     #define wxCALL_FOR_EACH  Error_wx_CALL_FOR_EACH_requires_variadic_macros_support
-#endif /* wxHAS_VARIADIC_MACROS */
+#endif /* HAVE_VARIADIC_MACROS */
 
 #endif /* _WX_CPP_H_ */
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index c9648e8bc8886e98d50a9aa74bb0fe2d7be2094c..26bbf9721c93fd8755424b7ebbd7baff620799f5 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -425,17 +425,6 @@ typedef short int WXTYPE;
     #endif /* va_copy/!va_copy */
 #endif /* wxVaCopy */
 
-#ifndef HAVE_VARIADIC_MACROS
-    #if wxCHECK_WATCOM_VERSION(1,2)
-        #define HAVE_VARIADIC_MACROS
-    #endif
-
-    #if wxCHECK_VISUALC_VERSION(9)
-        #define HAVE_VARIADIC_MACROS
-    #endif
-#endif /* HAVE_VARIADIC_MACROS */
-
-
 #ifndef HAVE_WOSTREAM
     /*
         Mingw <= 3.4 and all versions of Cygwin don't have std::wostream

diff --git a/include/wx/testing.h b/include/wx/testing.h
index dc1bd5ec33e050159c3eff441ec82cc153235748..99d375b0aef10681bc233e954c6585e68705881f 100644 (file)
--- a/include/wx/testing.h
+++ b/include/wx/testing.h
@@ -337,7 +337,7 @@ private:
           wxExpectModal<> for your dialog type and implement its OnInvoked()
           method.
  */
-#ifdef wxHAS_VARIADIC_MACROS
+#ifdef HAVE_VARIADIC_MACROS
 #define wxTEST_DIALOG(codeToRun, ...)                                          \
     {                                                                          \
         wxTEST_DIALOG_HOOK_CLASS wx_hook;                                      \
@@ -345,7 +345,7 @@ private:
         codeToRun;                                                             \
         wx_hook.CheckUnmetExpectations();                                      \
     }
-#endif /* wxHAS_VARIADIC_MACROS */
+#endif /* HAVE_VARIADIC_MACROS */
 
 #endif // !WXBUILDING
 

diff --git a/setup.h.in b/setup.h.in
index 75588db31162e2481601842e9fe3b1e27db2f239..8aaf1f5f18dfadeca0544d7e292a3709c42767f4 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -711,6 +711,12 @@
  */
 #undef HAVE_VARIADIC_MACROS
 
+/*
+ * Define if you don't want variadic macros to be used even if they are
+ * supported by the compiler.
+ */
+#undef wxNO_VARIADIC_MACROS
+
 /*
  * Define if your compiler has std::wstring
  */

diff --git a/tests/controls/dialogtest.cpp b/tests/controls/dialogtest.cpp
index 12f5833181779c0c021a39491c9facbe866450f3..d4780f15c5cc97e245d8edb122ce89fc673f115b 100644 (file)
--- a/tests/controls/dialogtest.cpp
+++ b/tests/controls/dialogtest.cpp
@@ -15,7 +15,7 @@
 
 #include "wx/testing.h"
 
-#ifdef wxHAS_VARIADIC_MACROS
+#ifdef HAVE_VARIADIC_MACROS
 
 #include "wx/msgdlg.h"
 #include "wx/filedlg.h"
@@ -122,4 +122,4 @@ void ModalDialogsTestCase::CustomDialog()
     CPPUNIT_ASSERT_EQUAL( 42, dlg.m_value );
 }
 
-#endif // wxHAS_VARIADIC_MACROS
+#endif // HAVE_VARIADIC_MACROS