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

Fixed various types like e.g. WXHWND for OS/2 that have been broken

Browse Source 
by the previous update.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2004-02-25 21:49:52 +00:00
parent c140b7e7c9
commit ddefbe7ff2
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/wx/defs.h
View File

@@ -2150,7 +2150,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSView);
typedef WX_NSView WXWidget; /* wxWindows BASE definition */ typedef WX_NSView WXWidget; /* wxWindows BASE definition */
#endif /* __WXCOCOA__ */ #endif /* __WXCOCOA__ */
#if defined(__WXMSW__) || defined(__WXPM__) #ifdef __WXMSW__
/* the keywords needed for WinMain() declaration */ /* the keywords needed for WinMain() declaration */
#ifdef __WIN16__ #ifdef __WIN16__
@@ -2165,7 +2165,7 @@ typedef WX_NSView WXWidget; /* wxWindows BASE definition */
# endif # endif
#endif /* Win16/32 */ #endif /* Win16/32 */
/* Stand-ins for Windows types or OS/2, to avoid #including all of windows.h or os2.h */ /* Stand-ins for Windows types to avoid #including all of windows.h */
typedef void * WXHWND; typedef void * WXHWND;
typedef void * WXHANDLE; typedef void * WXHANDLE;
typedef void * WXHICON; typedef void * WXHICON;
@@ -2199,11 +2199,6 @@ typedef void * WXLPCREATESTRUCT;
typedef WXHWND WXWidget; typedef WXHWND WXWidget;
#endif /* MSW or OS2 */
#ifdef __WXMSW__
#ifdef __WIN64__ #ifdef __WIN64__
typedef unsigned __int64 WXWPARAM; typedef unsigned __int64 WXWPARAM;
typedef __int64 WXLPARAM; typedef __int64 WXLPARAM;
@@ -2223,6 +2218,35 @@ typedef int (__stdcall *WXFARPROC)();
#if defined(__WXPM__) || defined(__EMX__) #if defined(__WXPM__) || defined(__EMX__)
#ifdef __WXPM__
/* Stand-ins for OS/2 types, to avoid #including all of os2.h */
typedef unsigned long WXHWND;
typedef unsigned long WXHANDLE;
typedef unsigned long WXHICON;
typedef unsigned long WXHFONT;
typedef unsigned long WXHMENU;
typedef unsigned long WXHPEN;
typedef unsigned long WXHBRUSH;
typedef unsigned long WXHPALETTE;
typedef unsigned long WXHCURSOR;
typedef unsigned long WXHRGN;
typedef unsigned long WXHACCEL;
typedef unsigned long WXHBITMAP;
typedef unsigned long WXHDC;
typedef unsigned int WXUINT;
typedef unsigned long WXDWORD;
typedef unsigned short WXWORD;
typedef unsigned long WXCOLORREF;
typedef void * WXMSG;
typedef unsigned long WXHTREEITEM;
typedef void * WXDRAWITEMSTRUCT;
typedef void * WXMEASUREITEMSTRUCT;
typedef void * WXLPCREATESTRUCT;
typedef WXHWND WXWidget;
#endif
#ifdef __EMX__ #ifdef __EMX__
/* Need a well-known type for WXFARPROC /* Need a well-known type for WXFARPROC
below. MPARAM is typedef'ed too late. */ below. MPARAM is typedef'ed too late. */