Make it possible to use svn-find-native-eols script without svn checkout.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 9f3391f000f463640fd8ed96f45f3b640c7def52..b5cc4e1eee526677c2aa41c54061f97736cbe59a 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -474,6 +474,8 @@
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
 
+#define wxUSE_PREFERENCES_EDITOR 0
+
 #define wxUSE_RICHTOOLTIP 0
 
 #define wxUSE_SASH          0
@@ -711,6 +713,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
  */
@@ -1258,10 +1266,6 @@
 
 #ifdef __WIN32__
 
-/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibility
-   with wx/msw/setup.h */
-#define wxUSE_XPM_IN_MSW wxUSE_XPM
-
 /* When using an external jpeg library and the Windows headers already define
  * boolean, define to the type used by the jpeg library for boolean.  */
 #undef wxHACK_BOOLEAN