Committing in .

 #undef before #def in order to suppress redefinition warnings

 Modified Files:
 	wxWindows/contrib/include/wx/deprecated/setup.h
 ----------------------------------------------------------------------

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

diff --git a/contrib/include/wx/deprecated/setup.h b/contrib/include/wx/deprecated/setup.h
index 5196376f80c65bfcce6a1535304374398ad4f4f3..0bee55cc614402ed245eb4bd7bd17c65e23eca76 100644 (file)
--- a/contrib/include/wx/deprecated/setup.h
+++ b/contrib/include/wx/deprecated/setup.h
@@ -19,6 +19,10 @@
 // Default is 0
 //
 // Recommended setting: 0 unless you have legacy code which uses these classes
+#ifdef wxUSE_TIMEDATE
+#undef wxUSE_TIMEDATE
+#endif
+
 #define wxUSE_TIMEDATE 0
 
 // wxProperty[Value/Form/List] classes, used by Dialog Editor
@@ -31,6 +35,9 @@
 #define wxUSE_PROLOGIO          1
 
 // Use .wxr resource mechanism (requires PrologIO library)
+#ifdef wxUSE_WX_RESOURCES
+#undef wxUSE_WX_RESOURCES
+#endif
 #define wxUSE_WX_RESOURCES      1
 
 #endif