From d3a5f4096c87655d62ba7e5455f7922b57f31820 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 3 Nov 2007 23:50:04 +0000 Subject: [PATCH] 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 --- include/wx/defs.h | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 475e18f5d7..0b8b502b7a 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2839,35 +2839,8 @@ typedef const void* WXWidget; /* included before or after wxWidgets classes, and therefore must be */ /* disabled here before any significant wxWidgets headers are included. */ #ifdef __WXMSW__ -#ifdef GetClassInfo -#undef GetClassInfo -#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 "wx/msw/winundef.h" +#endif /* __WXMSW__ */ /* --------------------------------------------------------------------------- */ /* macro to define a class without copy ctor nor assignment operator */