X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..30f82ea416c2b34d1d608cf6ebc369690eb2304e:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 3c2b9513e6..b4fb9a7b29 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -214,9 +214,9 @@ enum ErrCode // (as yet untested) by ensuring that we zero all the bits in a pointer // (which is always the same length as a long (at least with the LP64 standard) // --- offer aug 98 -#define wxDELETE(p) if ( (p) ) { delete (p); (p) = 0L; } +#define wxDELETE(p) if ( (p) ) { delete (p); p = 0L; } #else -#define wxDELETE(p) if ( (p) != NULL ) { delete (p); p = NULL; } +#define wxDELETE(p) if ( (p) != NULL ) { delete p; p = NULL; } #endif /* __SGI__CC__ */ // delete an array and NULL it (see comments above) @@ -224,7 +224,7 @@ enum ErrCode // see above comment. #define wxDELETEA(p) if ( (p) ) { delete [] (p); p = 0L; } #else -#define wxDELETEA(p) if ( ((void *)) (p) != NULL ) { delete [] (p); (void *) p = NULL; } +#define wxDELETEA(p) if ( ((void *) (p)) != NULL ) { delete [] p; p = NULL; } #endif /* __SGI__CC__ */ /// size of statically declared array @@ -867,6 +867,7 @@ typedef unsigned long WXCOLORREF; typedef void * WXRGNDATA; typedef void * WXMSG; typedef unsigned long WXHCONV; +typedef unsigned long WXHKEY; typedef void * WXDRAWITEMSTRUCT; typedef void * WXMEASUREITEMSTRUCT; typedef void * WXLPCREATESTRUCT;