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
This commit is contained in:
@@ -19,6 +19,10 @@
|
|||||||
// Default is 0
|
// Default is 0
|
||||||
//
|
//
|
||||||
// Recommended setting: 0 unless you have legacy code which uses these classes
|
// Recommended setting: 0 unless you have legacy code which uses these classes
|
||||||
|
#ifdef wxUSE_TIMEDATE
|
||||||
|
#undef wxUSE_TIMEDATE
|
||||||
|
#endif
|
||||||
|
|
||||||
#define wxUSE_TIMEDATE 0
|
#define wxUSE_TIMEDATE 0
|
||||||
|
|
||||||
// wxProperty[Value/Form/List] classes, used by Dialog Editor
|
// wxProperty[Value/Form/List] classes, used by Dialog Editor
|
||||||
@@ -31,6 +35,9 @@
|
|||||||
#define wxUSE_PROLOGIO 1
|
#define wxUSE_PROLOGIO 1
|
||||||
|
|
||||||
// Use .wxr resource mechanism (requires PrologIO library)
|
// Use .wxr resource mechanism (requires PrologIO library)
|
||||||
|
#ifdef wxUSE_WX_RESOURCES
|
||||||
|
#undef wxUSE_WX_RESOURCES
|
||||||
|
#endif
|
||||||
#define wxUSE_WX_RESOURCES 1
|
#define wxUSE_WX_RESOURCES 1
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user