X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a369f7c88ac33ee792046ed08eb2aa360befcea0..9a63feff3a93d9d9dc36f155d3a5c3a36cb922f0:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 8231ab2b64..af15a048aa 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -266,8 +266,8 @@ typedef int wxWindowID;
     #define wxEXPLICIT
 #endif /*  HAVE_EXPLICIT/!HAVE_EXPLICIT */
 
-/*  check for static/const/reinterpret_cast<>() */
-#ifndef HAVE_STATIC_CAST
+/* check for static/const_cast<>() (we don't use the other ones for now) */
+#ifndef HAVE_CXX_CASTS
     #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
         /*  VC++ 6.0 and 5.0 have C++ casts (what about earlier versions?) */
         #define HAVE_CXX_CASTS
@@ -276,14 +276,23 @@ typedef int wxWindowID;
         /*  GCC 2.95 has C++ casts, what about earlier versions? */
         #define HAVE_CXX_CASTS
     #endif
-#endif /*  HAVE_STATIC_CAST */
+#endif /*  !HAVE_CXX_CASTS */
 
 #ifdef HAVE_CXX_CASTS
     #ifndef HAVE_CONST_CAST
         #define HAVE_CONST_CAST
     #endif
+    #ifndef HAVE_STATIC_CAST
+        #define HAVE_STATIC_CAST
+    #endif
 #endif /*  HAVE_CXX_CASTS */
 
+#ifdef HAVE_CONST_CAST
+    #define wxConstCast(obj, className) const_cast<className *>(obj)
+#else
+    #define wxConstCast(obj, className) ((className *)(obj))
+#endif
+
 #ifndef HAVE_STD_WSTRING
     #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
         /*  VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?) */
@@ -1985,7 +1994,8 @@ enum wxPrintMode
     wxPRINT_MODE_NONE =    0,
     wxPRINT_MODE_PREVIEW = 1,   /*  Preview in external application */
     wxPRINT_MODE_FILE =    2,   /*  Print to file */
-    wxPRINT_MODE_PRINTER = 3    /*  Send to printer */
+    wxPRINT_MODE_PRINTER = 3,   /*  Send to printer */
+    wxPRINT_MODE_STREAM =  4    /*  Send postscript data into a stream */
 };
 
 /*  ---------------------------------------------------------------------------- */
@@ -2140,7 +2150,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSView);
 typedef WX_NSView WXWidget; /*  wxWindows BASE definition */
 #endif /*  __WXCOCOA__ */
 
-#if defined(__WXMSW__) || defined(__WXPM__)
+#ifdef __WXMSW__
 
 /*  the keywords needed for WinMain() declaration */
 #ifdef __WIN16__
@@ -2155,23 +2165,23 @@ typedef WX_NSView WXWidget; /*  wxWindows BASE definition */
 #  endif
 #endif /*  Win16/32 */
 
-/*  Stand-ins for Windows types or OS/2, to avoid #including all of windows.h or 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;
+/*  Stand-ins for Windows types to avoid #including all of windows.h */
+typedef void *          WXHWND;
+typedef void *          WXHANDLE;
+typedef void *          WXHICON;
+typedef void *          WXHFONT;
+typedef void *          WXHMENU;
+typedef void *          WXHPEN;
+typedef void *          WXHBRUSH;
+typedef void *          WXHPALETTE;
+typedef void *          WXHCURSOR;
+typedef void *          WXHRGN;
+typedef void *          WXHACCEL;
 typedef void WXFAR  *   WXHINSTANCE;
-typedef unsigned long   WXHBITMAP;
-typedef unsigned long   WXHIMAGELIST;
-typedef unsigned long   WXHGLOBAL;
-typedef unsigned long   WXHDC;
+typedef void *          WXHBITMAP;
+typedef void *          WXHIMAGELIST;
+typedef void *          WXHGLOBAL;
+typedef void *          WXHDC;
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
@@ -2179,9 +2189,9 @@ typedef unsigned short  WXWORD;
 typedef unsigned long   WXCOLORREF;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
-typedef unsigned long   WXHCONV;
-typedef unsigned long   WXHKEY;
-typedef unsigned long   WXHTREEITEM;
+typedef void *          WXHCONV;
+typedef void *          WXHKEY;
+typedef void *          WXHTREEITEM;
 
 typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
@@ -2189,12 +2199,15 @@ typedef void *          WXLPCREATESTRUCT;
 
 typedef WXHWND          WXWidget;
 
-#endif /*  MSW or OS2 */
-
-
-#ifdef __WXMSW__
+#ifdef __WIN64__
+typedef unsigned __int64    WXWPARAM;
+typedef __int64            WXLPARAM;
+typedef __int64            WXLRESULT;
+#else
 typedef unsigned int    WXWPARAM;
 typedef long            WXLPARAM;
+typedef long            WXLRESULT;
+#endif
 
 #if !defined(__WIN32__) || defined(__GNUWIN32__) || defined(__WXMICROWIN__)
 typedef int             (*WXFARPROC)();
@@ -2205,6 +2218,35 @@ typedef int             (__stdcall *WXFARPROC)();
 
 
 #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. */
@@ -2273,7 +2315,7 @@ typedef struct tagLOGPALETTE
     /*  VA 3.0 for some reason needs base data types when typedefing a proc proto??? */
 typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
 #else
-#ifdef __EMX__
+#if defined(__EMX__) && !defined(_System)
 #define _System
 #endif
 typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);