check if we are using compatible C++ ABI when usin GCC or IntelC++

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

diff --git a/include/wx/xti.h b/include/wx/xti.h
index b7fee4090da208298e4990c678d9156146b2abba..8dfab5f7c2d18a6e0a19f483dcba4df417b9f7f4 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -13,7 +13,7 @@
 #ifndef _WX_XTIH__
 #define _WX_XTIH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "xti.h"
 #endif
 
@@ -45,7 +45,9 @@
 // some compilers have troubles getting the correct wxPropertyAccessorT constructor
 // set this to 1 to make things work for these, too
 
+#ifndef WX_XTI_TEMPLATE_FIX
 #define WX_XTI_TEMPLATE_FIX 0
+#endif
 
 #if WX_XTI_TEMPLATE_FIX
 #define WX_XTI_PARAM_FIX(a,b) a,b