X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d716d96758a9f70b565fa849fc92bc6238047e8c..119143528d2ba3dc77ca533aece7982fdcb31bf5:/include/wx/defs.h?ds=sidebyside diff --git a/include/wx/defs.h b/include/wx/defs.h index 6601a8d52d..2df71e010d 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -124,6 +124,18 @@ #define __WIN32__ #endif +#ifdef __WXWINE__ + #ifndef __WIN32__ + #define __WIN32__ + #endif + #ifndef __WIN95__ + #define __WIN95__ + #endif + #ifndef STRICT + #define STRICT + #endif +#endif + #ifndef __WIN32__ #define __WIN16__ #endif @@ -497,7 +509,7 @@ typedef wxUint16 wxWord; #define wxSUNKEN_BORDER 0x08000000 #define wxRAISED_BORDER 0x04000000 #define wxBORDER 0x02000000 -#define wxSIMPLE_BORDER 0x02000000 +#define wxSIMPLE_BORDER wxBORDER #define wxSTATIC_BORDER 0x01000000 #define wxTRANSPARENT_WINDOW 0x00100000 #define wxNO_BORDER 0x00200000 @@ -518,10 +530,18 @@ typedef wxUint16 wxWord; // outside of dialogs. #define wxTAB_TRAVERSAL 0x00080000 +// Add this style if the control wants to get all keyboard messages (under +// Windows, it won't normally get the dialog navigation key events) +#define wxWANTS_CHARS 0x00040000 + // Orientations -#define wxHORIZONTAL 0x01 -#define wxVERTICAL 0x02 -#define wxBOTH (wxVERTICAL|wxHORIZONTAL) +enum wxOrientation +{ + wxHORIZONTAL = 0x01, + wxVERTICAL = 0x02, + wxBOTH = (wxVERTICAL | wxHORIZONTAL) +}; + #define wxCENTER_FRAME 0x04 /* centering into frame rather than screen */ /* @@ -741,6 +761,7 @@ typedef wxUint16 wxWord; #define wxSP_3D 0x0004 #define wxSP_BORDER 0x0008 #define wxSP_PERMIT_UNSPLIT 0x0010 +#define wxSP_LIVE_UPDATE 0x0020 /* * wxFrame extra flags @@ -1277,7 +1298,7 @@ typedef void * WXDRAWITEMSTRUCT; typedef void * WXMEASUREITEMSTRUCT; typedef void * WXLPCREATESTRUCT; -#ifdef __GNUWIN32__ +#if defined(__GNUWIN32__) || defined(__WXWINE__) typedef int (*WXFARPROC)(); #elif defined(__WIN32__) typedef int (__stdcall *WXFARPROC)();