don't undef Windows symbols here, just include wx/msw/winundef.h [backport of 48116 from trunk]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2839,35 +2839,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__ */
|
|
||||||
|
|
||||||
/* --------------------------------------------------------------------------- */
|
/* --------------------------------------------------------------------------- */
|
||||||
/* macro to define a class without copy ctor nor assignment operator */
|
/* macro to define a class without copy ctor nor assignment operator */
|
||||||
|
Reference in New Issue
Block a user