diff --git a/include/wx/defs.h b/include/wx/defs.h index 676b0ace7b..2452b337cc 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -604,15 +604,15 @@ enum typedef float wxFloat32 ; #if defined( __WXMAC__ ) && defined (__MWERKS__) - typedef short double wxFloat64; + typedef short double wxFloat64; #else - typedef double wxFloat64; + typedef double wxFloat64; #endif #if defined( __WXMAC__ ) && !defined( __POWERPC__ ) - typedef long double wxDouble; + typedef long double wxDouble; #else - typedef double wxDouble ; + typedef double wxDouble ; #endif // ---------------------------------------------------------------------------- @@ -1153,6 +1153,14 @@ enum wxStretch // standard IDs // ---------------------------------------------------------------------------- +// 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 diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index 6fda4bd30d..b804976522 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -18,17 +18,6 @@ #include "wx/object.h" // base class -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// id for a separator line in the menu (invalid for normal item) -#define wxID_SEPARATOR (-1) - -#ifndef ID_SEPARATOR // for compatibility only, don't use in new code - #define ID_SEPARATOR wxID_SEPARATOR -#endif - // ---------------------------------------------------------------------------- // forward declarations // ----------------------------------------------------------------------------