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
This commit is contained in:
Vadim Zeitlin
2013-07-11 22:40:47 +00:00
parent 46965705ca
commit 168d1f65c1
7 changed files with 33 additions and 25 deletions

View File

@@ -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