cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix windows.h inclusion problem on WinCE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-03-15 10:30:08 +00:00
parent ff759b6ad3
commit 839f48f25d
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/msw/wrapwin.h
View File

@ -43,22 +43,16 @@
#define _WIN32_WINNT 0x0600
#endif
/* Deal with clash with __WINDOWS__ include guard */
#if defined(__WXWINCE__) && defined(__WINDOWS__)
#undef __WINDOWS__
#endif
#include <windows.h>
#ifdef __WXWINCE__
// this doesn't make any sense knowing that windows.h includes all these
// headers anyhow, but the fact remains that when building using eVC 4 the
// functions and constants from these headers are not defined unless we
// explicitly include them ourselves -- how is it possible is beyond me...
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
// this one OTOH contains many useful CE-only functions
#include <shellapi.h>
#endif // __WXWINCE__
#if defined(__WXWINCE__) && !defined(__WINDOWS__)
#define __WINDOWS__
#endif
// #undef the macros defined in winsows.h which conflict with code elsewhere
#include "wx/msw/winundef.h"