include wx/msw/winundef.g instead of writing just a subset of #undefs in wx/defs.h itself (patch 1774707)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2945,35 +2945,8 @@ typedef const void* WXWidget;
|
|||||||
/* included before or after wxWidgets classes, and therefore must be */
|
/* included before or after wxWidgets classes, and therefore must be */
|
||||||
/* disabled here before any significant wxWidgets headers are included. */
|
/* disabled here before any significant wxWidgets headers are included. */
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
#ifdef GetClassInfo
|
#include "wx/msw/winundef.h"
|
||||||
#undef GetClassInfo
|
#endif /* __WXMSW__ */
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef GetClassName
|
|
||||||
#undef GetClassName
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef DrawText
|
|
||||||
#undef DrawText
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef GetCharWidth
|
|
||||||
#undef GetCharWidth
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef StartDoc
|
|
||||||
#undef StartDoc
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef FindWindow
|
|
||||||
#undef FindWindow
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef FindResource
|
|
||||||
#undef FindResource
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
/* __WXMSW__ */
|
|
||||||
|
|
||||||
|
|
||||||
/* include the feature test macros */
|
/* include the feature test macros */
|
||||||
|
Reference in New Issue
Block a user