moved wxID_SEPARATOR from menuitem.h to defs.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
85ec2f2634
commit
20d9661c04
@ -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
|
||||
|
||||
|
@ -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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user