X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9b10d03f29bd3284f675c02149f6419280f1efe..bd5dd95757ce697f95a39cfc6f346fe93421bc36:/include/wx/defs.h?ds=sidebyside diff --git a/include/wx/defs.h b/include/wx/defs.h index 93daa1ce38..71c80d3284 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -181,6 +181,12 @@ // in VC++ 4.2 the bool keyword is reserved (hence can't be typedefed) // but not implemented, so we must #define it #define bool unsigned int + #elif defined(__VISUALC__) && (__VISUALC__ == 1010) + // For VisualC++ 4.1, we need to define + // bool as something between 4.0 & 5.0... + typedef unsigned int wxbool; + #define bool wxbool + #define HAVE_BOOL #elif defined(__VISUALC__) && (__VISUALC__ > 1020) // VC++ supports bool since 4.2 #define HAVE_BOOL @@ -605,6 +611,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&); #define wxSP_NOBORDER 0x0000 #define wxSP_3D 0x0004 #define wxSP_BORDER 0x0008 +#define wxSP_PERMIT_UNSPLIT 0x0010 /* * wxFrame extra flags @@ -892,7 +899,7 @@ enum wxKeyCode WXK_NUMPAD_DOWN, WXK_NUMPAD_PRIOR, WXK_NUMPAD_PAGEUP, - WXK_NUMPAD_NEXT + WXK_NUMPAD_NEXT, WXK_NUMPAD_PAGEDOWN, WXK_NUMPAD_END, WXK_NUMPAD_BEGIN,