From: Jouk Jansen <joukj@hrem.nano.tudelft.nl>
Date: Fri, 25 Apr 2003 06:06:08 +0000 (+0000)
Subject:  Committing in .
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c5a2f2747825dc64950478738b113bc2e79f0f25?hp=56cc1400c7f760c95a057a24b9475b0437e107b9

 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 5196376f80..0bee55cc61 100644
--- 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