AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use wx/msw/winundef.h for wxGTK under Windows too.

Browse Source 
Avoid clashes due to <windows.h> definitions in wxGTK too.

Closes #14427.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-06-20 17:54:53 +00:00
parent 6fafab0ea3
commit fa3f11806e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/afterstd.h
View File

@ -13,7 +13,7 @@
See the comments in beforestd.h. See the comments in beforestd.h.
*/ */
#if defined(__WXMSW__) #if defined(__WINDOWS__)
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif #endif

8
include/wx/defs.h
View File

@ -30,7 +30,7 @@
#ifdef __cplusplus #ifdef __cplusplus
/* Make sure the environment is set correctly */ /* Make sure the environment is set correctly */
# if defined(__WXMSW__) && defined(__X__) # if defined(__WXMSW__) && defined(__X__)
# error "Target can't be both X and Windows" # error "Target can't be both X and MSW"
# elif !defined(__WXMOTIF__) && \ # elif !defined(__WXMOTIF__) && \
!defined(__WXMSW__) && \ !defined(__WXMSW__) && \
!defined(__WXGTK__) && \ !defined(__WXGTK__) && \
@ -3018,7 +3018,9 @@ typedef void * WXDRAWITEMSTRUCT;
typedef void * WXMEASUREITEMSTRUCT; typedef void * WXMEASUREITEMSTRUCT;
typedef void * WXLPCREATESTRUCT; typedef void * WXLPCREATESTRUCT;
#ifdef __WXMSW__
typedef WXHWND WXWidget; typedef WXHWND WXWidget;
#endif
#ifdef __WIN64__ #ifdef __WIN64__
typedef unsigned __int64 WXWPARAM; typedef unsigned __int64 WXWPARAM;
@ -3254,9 +3256,9 @@ 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 __cplusplus #ifdef __cplusplus
#ifdef __WXMSW__ #ifdef __WINDOWS__
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif /* __WXMSW__ */ #endif /* __WINDOWS__ */
#endif /* __cplusplus */ #endif /* __cplusplus */