X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7682a175b67aa93cefe5cdd0cbf481b49c086d20..ab20a9a95a8bbed75bfc6ecba20f013eb9dcff46:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index e35d3e8c97..42dbd1e910 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -465,7 +465,8 @@ enum wxMGL_UNIX, // MGL with direct hardware access wxMGL_X, // MGL on X wxMGL_WIN32, // MGL on Win32 - wxMGL_OS2 // MGL on OS/2 + wxMGL_OS2, // MGL on OS/2 + wxWINDOWS_OS2 // Native OS/2 PM }; // ---------------------------------------------------------------------------- @@ -948,6 +949,9 @@ enum wxStretch * wxNotebook flags */ #define wxNB_FIXEDWIDTH 0x0008 +#define wxNB_LEFT 0x0020 +#define wxNB_RIGHT 0x0040 +#define wxNB_BOTTOM 0x0080 /* * wxStatusBar95 flags @@ -1469,8 +1473,15 @@ typedef unsigned long WXHDC; typedef unsigned int WXUINT; typedef unsigned long WXDWORD; typedef unsigned short WXWORD; +#ifdef __WXMSW__ typedef unsigned int WXWPARAM; typedef long WXLPARAM; +#else +# define WXWPARAM MPARAM +# define WXLPARAM MPARAM +# define RECT RECTL +# define LOGFONT FATTRS +#endif typedef unsigned long WXCOLORREF; typedef void * WXRGNDATA; typedef void * WXMSG;