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

        by the previous update.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index a5e656d22496f8837404bff0a540693acdc10b50..3649f23a318af009300672888b5165a6f39a9ab0 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2150,7 +2150,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSView);
 typedef WX_NSView WXWidget; /*  wxWindows BASE definition */
 #endif /*  __WXCOCOA__ */
 
 typedef WX_NSView WXWidget; /*  wxWindows BASE definition */
 #endif /*  __WXCOCOA__ */
 

-#if defined(__WXMSW__) || defined(__WXPM__)
+#ifdef __WXMSW__

 
 /*  the keywords needed for WinMain() declaration */
 #ifdef __WIN16__
 
 /*  the keywords needed for WinMain() declaration */
 #ifdef __WIN16__


@@ -2165,7 +2165,7 @@ typedef WX_NSView WXWidget; /*  wxWindows BASE definition */
 #  endif
 #endif /*  Win16/32 */
 
 #  endif
 #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 *          WXHANDLE;
 typedef void *          WXHICON;
 typedef void *          WXHWND;
 typedef void *          WXHANDLE;
 typedef void *          WXHICON;


@@ -2199,11 +2199,6 @@ typedef void *          WXLPCREATESTRUCT;
 
 typedef WXHWND          WXWidget;
 
 
 typedef WXHWND          WXWidget;
 

-#endif /*  MSW or OS2 */
-
-
-#ifdef __WXMSW__
-

 #ifdef __WIN64__
 typedef unsigned __int64    WXWPARAM;
 typedef __int64            WXLPARAM;
 #ifdef __WIN64__
 typedef unsigned __int64    WXWPARAM;
 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__
 /* Need a well-known type for WXFARPROC
    below. MPARAM is typedef'ed too late. */
 #ifdef __EMX__
 /* Need a well-known type for WXFARPROC
    below. MPARAM is typedef'ed too late. */