moved wxDash typedef to gdicmn.h

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 8f7b1ffa9d9a02cc4719b6e4ddb28a0f46bf0043..bd68bd96991c32b18a0d35dbd103452560dcb378 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -62,7 +62,10 @@
     #endif
 
     // Place other OS/2 compiler environment defines here
     #endif
 
     // Place other OS/2 compiler environment defines here

-    #define LINKAGEMODE _Optlink
+    #if defined(__VISAGECPP__)
+        // VisualAge is the only thing that understands _Optlink
+        #define LINKAGEMODE _Optlink
+    #endif

 #else   // Windows
     #ifndef __WINDOWS__
         #define __WINDOWS__
 #else   // Windows
     #ifndef __WINDOWS__
         #define __WINDOWS__


@@ -119,11 +122,12 @@
 #endif // VC++ 1.5
 
 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,
 #endif // VC++ 1.5
 
 // Digital Unix C++ compiler only defines this symbol for .cxx and .hxx files,

-// so define it ourselves
+// so define it ourselves (newer versions do it for all files, though, and
+// don't allow it to be redefined)

 #ifdef __DECCXX
 #ifdef __DECCXX

-#ifndef __VMS
-# define __cplusplus
-#endif
+    #if !defined(__VMS) && !defined(__cplusplus)
+        #define __cplusplus
+    #endif

 #endif // __DECCXX
 
 // Resolves linking problems under HP-UX
 #endif // __DECCXX
 
 // Resolves linking problems under HP-UX


@@ -135,15 +139,19 @@
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
 #if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
 #if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))

-#ifndef wxUSE_NORLANDER_HEADERS
-#   define wxUSE_NORLANDER_HEADERS 1
-#endif
+    #ifndef wxUSE_NORLANDER_HEADERS
+        #define wxUSE_NORLANDER_HEADERS 1
+    #endif
+#else
+    #ifndef wxUSE_NORLANDER_HEADERS
+        #define wxUSE_NORLANDER_HEADERS 0
+    #endif

 #endif
 
 // "old" GNUWIN32 is the one without Norlander's headers: it lacks the standard
 // Win32 headers and we define the used stuff ourselves for it in
 // wx/msw/gnuwin32/extra.h
 #endif
 
 // "old" GNUWIN32 is the one without Norlander's headers: it lacks the standard
 // Win32 headers and we define the used stuff ourselves for it in
 // wx/msw/gnuwin32/extra.h

-#if defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS
+#if defined(__GNUC__) && !wxUSE_NORLANDER_HEADERS

     #define __GNUWIN32_OLD__
 #endif
 
     #define __GNUWIN32_OLD__
 #endif
 


@@ -161,9 +169,11 @@
 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

-// wxWindows checks for WIN32, not __WIN32__
-#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
-#define __WIN32__
+
+#if defined(_WIN32) || defined(WIN32) || defined(__NT__)
+    #ifndef __WIN32__
+        #define __WIN32__
+    #endif

 #endif
 
 #ifdef __WXWINE__
 #endif
 
 #ifdef __WXWINE__


@@ -317,19 +327,35 @@ typedef int wxWindowID;
     #define WXUNUSED(identifier) identifier
 #endif
 
     #define WXUNUSED(identifier) identifier
 #endif
 

+// some arguments are only used in debug mode, but unused in release one
+#ifdef __WXDEBUG__
+    #define WXUNUSED_UNLESS_DEBUG(param)  param
+#else
+    #define WXUNUSED_UNLESS_DEBUG(param)  WXUNUSED(param)
+#endif
+

 // ----------------------------------------------------------------------------
 // portable calling conventions macros
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // portable calling conventions macros
 // ----------------------------------------------------------------------------
 

-// wxCALLBACK should be used for the functions which are called back by
-// Windows (such as compare function for wxListCtrl)
-#if defined(__WIN32__)
-    #if defined(__MINGW32__) || defined(__GNUWIN32__)
-        #define wxCALLBACK __attribute__((stdcall))
+// stdcall is used for all functions called by Windows under Windows
+#ifdef __WINDOWS__
+    #if defined(__GNUWIN32__)
+        #define wxSTDCALL __attribute__((stdcall))

     #else
         // both VC++ and Borland understand this
     #else
         // both VC++ and Borland understand this

-        #define wxCALLBACK _stdcall
+        #define wxSTDCALL _stdcall

     #endif
     #endif

+
+#else // Win
+    // no such stupidness under Unix
+    #define wxSTDCALL
+#endif // platform
+
+// wxCALLBACK should be used for the functions which are called back by
+// Windows (such as compare function for wxListCtrl)
+#if defined(__WIN32__)
+    #define wxCALLBACK wxSTDCALL

 #else
     // no stdcall under Unix nor Win16
     #define wxCALLBACK
 #else
     // no stdcall under Unix nor Win16
     #define wxCALLBACK


@@ -371,6 +397,22 @@ typedef int wxWindowID;
 #    define WXDLLEXPORT_CTORFN
 #  endif
 
 #    define WXDLLEXPORT_CTORFN
 #  endif
 

+#elif defined(__GNUC__)
+
+#  ifdef WXMAKINGDLL
+#    define WXDLLEXPORT __declspec( dllexport )
+#    define WXDLLEXPORT_DATA(type) __declspec( dllexport ) type
+#    define WXDLLEXPORT_CTORFN
+#  elif defined(WXUSINGDLL)
+#    define WXDLLEXPORT __declspec( dllimport )
+#    define WXDLLEXPORT_DATA(type) __declspec( dllimport ) type
+#    define WXDLLEXPORT_CTORFN
+#  else
+#    define WXDLLEXPORT
+#    define WXDLLEXPORT_DATA(type) type
+#    define WXDLLEXPORT_CTORFN
+#  endif
+

 #elif defined(__WXPM__)
 
 #  ifdef WXMAKINGDLL
 #elif defined(__WXPM__)
 
 #  ifdef WXMAKINGDLL


@@ -599,9 +641,9 @@ enum
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)

-    typedef short double       wxFloat64;
+    typedef short double wxFloat64;

 #else
 #else

-    typedef double                     wxFloat64;
+    typedef double wxFloat64;

 #endif
 
 #if defined( __WXMAC__ )  && !defined( __POWERPC__ )
 #endif
 
 #if defined( __WXMAC__ )  && !defined( __POWERPC__ )


@@ -631,30 +673,30 @@ typedef float wxFloat32 ;
 #if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh )
 // assembler versions for these
 #ifdef __POWERPC__
 #if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh )
 // assembler versions for these
 #ifdef __POWERPC__

-       inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i )
-               {return (__lhbrx( &i , 0 ) ) ;}
-       inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i )
-               {return (__lhbrx( &i , 0 ) ) ;}
-       inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i )
-               {return (__lwbrx( &i , 0 ) ) ;}
-       inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i )
-               {return (__lwbrx( &i , 0 ) ) ;}
+    inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i )
+        {return (__lhbrx( &i , 0 ) ) ;}
+    inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i )
+        {return (__lhbrx( &i , 0 ) ) ;}
+    inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i )
+        {return (__lwbrx( &i , 0 ) ) ;}
+    inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i )
+        {return (__lwbrx( &i , 0 ) ) ;}

 #else
 #else

-       #pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0)
-       pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value)
-               = { 0xE158 };
-       
-       #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
-       pascal wxInt16 wxUINT16_SWAP_ALWAYS(wxInt16 value)
-               = { 0xE158 };
-
-       #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
-       pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value)
-               = { 0xE158, 0x4840, 0xE158 };
-
-       #pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
-       pascal wxInt32 wxUINT32_SWAP_ALWAYS(wxInt32 value)
-               = { 0xE158, 0x4840, 0xE158 };
+    #pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0)
+    pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value)
+        = { 0xE158 };
+
+    #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
+    pascal wxInt16 wxUINT16_SWAP_ALWAYS(wxInt16 value)
+        = { 0xE158 };
+
+    #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
+    pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value)
+        = { 0xE158, 0x4840, 0xE158 };
+
+    #pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
+    pascal wxInt32 wxUINT32_SWAP_ALWAYS(wxInt32 value)
+        = { 0xE158, 0x4840, 0xE158 };

 
 #endif
 #else // !MWERKS
 
 #endif
 #else // !MWERKS


@@ -805,20 +847,20 @@ enum wxStretch
 #define wxTRANSPARENT_WINDOW    0x00100000
 #define wxNO_BORDER             0x00200000
 
 #define wxTRANSPARENT_WINDOW    0x00100000
 #define wxNO_BORDER             0x00200000
 

+// Override CTL3D etc. control colour processing to allow own background
+// colour.
+// OBSOLETE - use wxNO_3D instead

 #define wxUSER_COLOURS          0x00800000
 #define wxUSER_COLOURS          0x00800000

-                                 // Override CTL3D etc. control colour processing to
-                                 // allow own background colour
-                                 // OBSOLETE - use wxNO_3D instead
+// Override CTL3D or native 3D styles for children

 #define wxNO_3D                 0x00800000
 #define wxNO_3D                 0x00800000

-                                 // Override CTL3D or native 3D styles for children
+
+// Clip children when painting, which reduces flicker in e.g. frames and
+// splitter windows, but can't be used in a panel where a static box must be
+// 'transparent' (panel paints the background for it)

 #define wxCLIP_CHILDREN         0x00400000
 #define wxCLIP_CHILDREN         0x00400000

-                                 // Clip children when painting, which reduces flicker in
-                                 // e.g. frames and splitter windows, but can't be used in
-                                 // a panel where a static box must be 'transparent' (panel
-                                 // paints the background for it)

 
 

-// Add this style to a panel to get tab traversal working
-// outside of dialogs.
+// Add this style to a panel to get tab traversal working outside of dialogs
+// (on by default for wxPanel, wxDialog, wxScrolledWindow)

 #define wxTAB_TRAVERSAL         0x00080000
 
 // Add this style if the control wants to get all keyboard messages (under
 #define wxTAB_TRAVERSAL         0x00080000
 
 // Add this style if the control wants to get all keyboard messages (under


@@ -832,6 +874,17 @@ enum wxStretch
 // don't invalidate the whole window (resulting in a PAINT event) when the
 // window is resized (currently, makes sense for wxMSW only)
 #define wxNO_FULL_REPAINT_ON_RESIZE 0x00010000
 // don't invalidate the whole window (resulting in a PAINT event) when the
 // window is resized (currently, makes sense for wxMSW only)
 #define wxNO_FULL_REPAINT_ON_RESIZE 0x00010000

+
+/*
+ * Extra window style flags (use wxWS_EX prefix to make it clear that they
+ * should be passed to wxWindow::SetExtraStyle(), not SetWindowStyle())
+ */
+
+// by default, TransferDataTo/FromWindow() only work on direct children of the
+// window (compatible behaviour), set this flag to make them recursively
+// descend into all subwindows
+#define wxWS_EX_VALIDATE_RECURSIVELY    0x00000001
+

 /*
  * wxFrame/wxDialog style flags
  */
 /*
  * wxFrame/wxDialog style flags
  */


@@ -852,6 +905,12 @@ enum wxStretch
 // Add for normal Windows frame behaviour
 #define wxFRAME_FLOAT_ON_PARENT 0x0020
 
 // Add for normal Windows frame behaviour
 #define wxFRAME_FLOAT_ON_PARENT 0x0020
 

+/*
+ * MDI parent frame style flags
+ * Can overlap with some of the above.
+ */
+
+#define wxFRAME_NO_WINDOW_MENU  0x0100

 
 #if WXWIN_COMPATIBILITY
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
 
 #if WXWIN_COMPATIBILITY
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE


@@ -926,10 +985,9 @@ enum wxStretch
 /*
  * wxTextCtrl style flags
  */
 /*
  * wxTextCtrl style flags
  */

-#define wxPROCESS_ENTER     0x0004
-#define wxPASSWORD          0x0008
-#define wxTE_PROCESS_ENTER  wxPROCESS_ENTER
-#define wxTE_PASSWORD       wxPASSWORD
+// the flag bits 0x0001, 2, 4 and 8 are free but should be used only for the
+// things which don't make sense for a text control used by wxTextEntryDialog
+// because they would otherwise conflict with wxOK, wxCANCEL, wxCENTRE

 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 #define wxTE_PROCESS_TAB    0x0040
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 #define wxTE_PROCESS_TAB    0x0040


@@ -938,6 +996,10 @@ enum wxStretch
 #define wxTE_RICH           0x0080
 #define wxTE_NO_VSCROLL     0x0100
 #define wxTE_AUTO_SCROLL    0x0200
 #define wxTE_RICH           0x0080
 #define wxTE_NO_VSCROLL     0x0100
 #define wxTE_AUTO_SCROLL    0x0200

+#define wxPROCESS_ENTER     0x0400
+#define wxPASSWORD          0x0800
+#define wxTE_PROCESS_ENTER  wxPROCESS_ENTER
+#define wxTE_PASSWORD       wxPASSWORD

 
 /*
  * wxComboBox style flags
 
 /*
  * wxComboBox style flags


@@ -1041,12 +1103,15 @@ enum wxStretch
 // #define wxLC_SHOW_SEL_ALWAYS
 
 /*
 // #define wxLC_SHOW_SEL_ALWAYS
 
 /*

- * wxSpinButton flags
+ * wxSpinButton flags.
+ * Note that a wxSpinCtrl is sometimes defined as
+ * a wxTextCtrl, and so the flags must be different
+ * from wxTextCtrl's.

  */
 #define wxSP_HORIZONTAL       wxHORIZONTAL // 4
 #define wxSP_VERTICAL         wxVERTICAL   // 8
  */
 #define wxSP_HORIZONTAL       wxHORIZONTAL // 4
 #define wxSP_VERTICAL         wxVERTICAL   // 8

-#define wxSP_ARROW_KEYS       0x0010
-#define wxSP_WRAP             0x0020
+#define wxSP_ARROW_KEYS       0x1000
+#define wxSP_WRAP             0x2000

 
 /*
  * wxSplitterWindow flags
 
 /*
  * wxSplitterWindow flags


@@ -1103,7 +1168,10 @@ enum wxStretch
 #define wxPD_AUTO_HIDE          0x0004
 #define wxPD_ELAPSED_TIME       0x0008
 #define wxPD_ESTIMATED_TIME     0x0010
 #define wxPD_AUTO_HIDE          0x0004
 #define wxPD_ELAPSED_TIME       0x0008
 #define wxPD_ESTIMATED_TIME     0x0010

-#define wxPD_REMAINING_TIME     0x0020
+// wxGA_SMOOTH = 0x0020 may also be used with wxProgressDialog
+// NO!!! This is wxDIALOG_MODAL and will cause the progress dialog to
+// be modal. No progress will then be made at all.
+#define wxPD_REMAINING_TIME     0x0040

 
 /*
  * wxHtmlWindow flags
 
 /*
  * wxHtmlWindow flags


@@ -1117,6 +1185,8 @@ enum wxStretch
 #define wxCAL_SUNDAY_FIRST      0x0000
 #define wxCAL_MONDAY_FIRST      0x0001
 #define wxCAL_SHOW_HOLIDAYS     0x0002
 #define wxCAL_SUNDAY_FIRST      0x0000
 #define wxCAL_MONDAY_FIRST      0x0001
 #define wxCAL_SHOW_HOLIDAYS     0x0002

+#define wxCAL_NO_YEAR_CHANGE    0x0004
+#define wxCAL_NO_MONTH_CHANGE   0x000c // no month change => no year change

 
 /*
  * extended dialog specifiers. these values are stored in a different
 
 /*
  * extended dialog specifiers. these values are stored in a different


@@ -1158,11 +1228,6 @@ enum wxStretch
 // id for a separator line in the menu (invalid for normal item)
 #define wxID_SEPARATOR (-1)
 
 // id for a separator line in the menu (invalid for normal item)
 #define wxID_SEPARATOR (-1)
 

-// this one is for compatibility only, don't use in new code
-#ifndef ID_SEPARATOR
-    #define ID_SEPARATOR    wxID_SEPARATOR
-#endif
-

 // Standard menu IDs
 #define wxID_LOWEST             4999
 
 // Standard menu IDs
 #define wxID_LOWEST             4999
 


@@ -1276,6 +1341,8 @@ enum {
 
 // Brush & Pen Stippling. Note that a stippled pen cannot be dashed!!
 // Note also that stippling a Pen IS meaningfull, because a Line is
 
 // Brush & Pen Stippling. Note that a stippled pen cannot be dashed!!
 // Note also that stippling a Pen IS meaningfull, because a Line is

+  wxSTIPPLE_MASK_OPAQUE, //mask is used for blitting monochrome using text fore and back ground colors
+  wxSTIPPLE_MASK,        //mask is used for masking areas in the stipple bitmap (TO DO)

 // drawn with a Pen, and without any Brush -- and it can be stippled.
   wxSTIPPLE =          110,
   wxBDIAGONAL_HATCH,
 // drawn with a Pen, and without any Brush -- and it can be stippled.
   wxSTIPPLE =          110,
   wxBDIAGONAL_HATCH,


@@ -1299,24 +1366,22 @@ enum {
 // Logical ops
 typedef enum
 {
 // Logical ops
 typedef enum
 {

-  wxCLEAR,      // 0
-  wxXOR,        // src XOR dst
-  wxINVERT,     // NOT dst
-  wxOR_REVERSE, // src OR (NOT dst)
-  wxAND_REVERSE,// src AND (NOT dst)
-  wxCOPY,       // src
-  wxAND,        // src AND dst
-  wxAND_INVERT, // (NOT src) AND dst
-  wxNO_OP,      // dst
-  wxNOR,        // (NOT src) AND (NOT dst)
-  wxEQUIV,      // (NOT src) XOR dst
-  wxSRC_INVERT, // (NOT src)
-  wxOR_INVERT,  // (NOT src) OR dst
-  wxNAND,       // (NOT src) OR (NOT dst)
-  wxOR,         // src OR dst
-  wxSET,        // 1
-  wxSRC_OR,     // source _bitmap_ OR destination
-  wxSRC_AND     // source _bitmap_ AND destination
+  wxCLEAR,        wxROP_BLACK = wxCLEAR,             wxBLIT_BLACKNESS = wxCLEAR,        // 0
+  wxXOR,          wxROP_XORPEN = wxXOR,              wxBLIT_SRCINVERT = wxXOR,          // src XOR dst
+  wxINVERT,       wxROP_NOT = wxINVERT,              wxBLIT_DSTINVERT = wxINVERT,       // NOT dst
+  wxOR_REVERSE,   wxROP_MERGEPENNOT = wxOR_REVERSE,  wxBLIT_00DD0228 = wxOR_REVERSE,    // src OR (NOT dst)
+  wxAND_REVERSE,  wxROP_MASKPENNOT = wxAND_REVERSE,  wxBLIT_SRCERASE = wxAND_REVERSE,   // src AND (NOT dst)
+  wxCOPY,         wxROP_COPYPEN = wxCOPY,            wxBLIT_SRCCOPY = wxCOPY,           // src
+  wxAND,          wxROP_MASKPEN = wxAND,             wxBLIT_SRCAND = wxAND,             // src AND dst
+  wxAND_INVERT,   wxROP_MASKNOTPEN = wxAND_INVERT,   wxBLIT_00220326 = wxAND_INVERT,    // (NOT src) AND dst
+  wxNO_OP,        wxROP_NOP = wxNO_OP,               wxBLIT_00AA0029 = wxNO_OP,         // dst
+  wxNOR,          wxROP_NOTMERGEPEN = wxNOR,         wxBLIT_NOTSRCERASE = wxNOR,        // (NOT src) AND (NOT dst)
+  wxEQUIV,        wxROP_NOTXORPEN = wxEQUIV,         wxBLIT_00990066 = wxEQUIV,         // (NOT src) XOR dst
+  wxSRC_INVERT,   wxROP_NOTCOPYPEN = wxSRC_INVERT,   wxBLIT_NOTSCRCOPY = wxSRC_INVERT,  // (NOT src)
+  wxOR_INVERT,    wxROP_MERGENOTPEN = wxOR_INVERT,   wxBLIT_MERGEPAINT = wxOR_INVERT,   // (NOT src) OR dst
+  wxNAND,         wxROP_NOTMASKPEN = wxNAND,         wxBLIT_007700E6 = wxNAND,          // (NOT src) OR (NOT dst)
+  wxOR,           wxROP_MERGEPEN = wxOR,             wxBLIT_SRCPAINT = wxOR,            // src OR dst
+  wxSET,          wxROP_WHITE = wxSET,               wxBLIT_WHITENESS = wxSET           // 1

 } form_ops_t;
 
 /* Flood styles */
 } form_ops_t;
 
 /* Flood styles */


@@ -1611,28 +1676,28 @@ typedef enum {
 
 #ifdef __WXMAC__
 
 
 #ifdef __WXMAC__
 

-typedef WindowPtr      WXHWND;
-typedef Handle                         WXHANDLE;
-typedef CIconHandle            WXHICON;
+typedef WindowPtr       WXHWND;
+typedef Handle               WXHANDLE;
+typedef CIconHandle        WXHICON;

 //typedef unsigned long   WXHFONT;
 //typedef unsigned long   WXHFONT;

-typedef MenuHandle     WXHMENU;
+typedef MenuHandle       WXHMENU;

 //typedef unsigned long   WXHPEN;
 //typedef unsigned long   WXHBRUSH;
 //typedef unsigned long   WXHPALETTE;
 //typedef unsigned long   WXHPEN;
 //typedef unsigned long   WXHBRUSH;
 //typedef unsigned long   WXHPALETTE;

-typedef CursHandle     WXHCURSOR;
-typedef RgnHandle      WXHRGN;
+typedef CursHandle       WXHCURSOR;
+typedef RgnHandle       WXHRGN;

 //typedef unsigned long   WXHACCEL;
 //typedef unsigned long   WXHINSTANCE;
 typedef GWorldPtr   WXHBITMAP;
 //typedef unsigned long   WXHIMAGELIST;
 //typedef unsigned long   WXHGLOBAL;
 //typedef unsigned long   WXHACCEL;
 //typedef unsigned long   WXHINSTANCE;
 typedef GWorldPtr   WXHBITMAP;
 //typedef unsigned long   WXHIMAGELIST;
 //typedef unsigned long   WXHGLOBAL;

-typedef GrafPtr                WXHDC;
+typedef GrafPtr           WXHDC;

 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
 //typedef unsigned int    WXWPARAM;
 //typedef long            WXLPARAM;
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
 //typedef unsigned int    WXWPARAM;
 //typedef long            WXLPARAM;

-typedef RGBColor               WXCOLORREF;
+typedef RGBColor           WXCOLORREF;

 //typedef void *          WXRGNDATA;
 //typedef void *          WXMSG;
 //typedef unsigned long   WXHCONV;
 //typedef void *          WXRGNDATA;
 //typedef void *          WXMSG;
 //typedef unsigned long   WXHCONV;


@@ -1756,6 +1821,20 @@ typedef WXHWND WXWidget;
 #endif
 #endif
 
 #endif
 #endif
 

+// the keywords needed for WinMain() declaration
+
+#ifdef __WIN16__
+        #ifdef __VISUALC__
+            #define WXFAR __far
+        #else // !VC++
+            #define WXFAR _far
+        #endif
+#else // Win32
+    #ifndef WXFAR
+        #define WXFAR
+    #endif
+#endif // Win16/32
+

 #endif // MSW
 
 #ifdef __WXMOTIF__
 #endif // MSW
 
 #ifdef __WXMOTIF__


@@ -1821,8 +1900,8 @@ typedef struct _GtkTooltips       GtkTooltips;
 typedef struct _GtkNotebook       GtkNotebook;
 typedef struct _GtkNotebookPage   GtkNotebookPage;
 typedef struct _GtkAccelGroup     GtkAccelGroup;
 typedef struct _GtkNotebook       GtkNotebook;
 typedef struct _GtkNotebookPage   GtkNotebookPage;
 typedef struct _GtkAccelGroup     GtkAccelGroup;

-typedef        struct _GtkItemFactory    GtkItemFactory;
-typedef        struct _GtkSelectionData  GtkSelectionData;
+typedef struct _GtkItemFactory    GtkItemFactory;
+typedef struct _GtkSelectionData  GtkSelectionData;

 
 typedef GtkWidget *WXWidget;
 #endif // GTK
 
 typedef GtkWidget *WXWidget;
 #endif // GTK