cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved wxID_SEPARATOR from menuitem.h to defs.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-12-13 00:55:35 +00:00
parent 85ec2f2634
commit 20d9661c04
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/defs.h
View File

@ -604,15 +604,15 @@ enum
typedef float wxFloat32 ; typedef float wxFloat32 ;
#if defined( __WXMAC__ ) && defined (__MWERKS__) #if defined( __WXMAC__ ) && defined (__MWERKS__)
typedef short double wxFloat64; typedef short double wxFloat64;
#else #else
typedef double wxFloat64; typedef double wxFloat64;
#endif #endif
#if defined( __WXMAC__ ) && !defined( __POWERPC__ ) #if defined( __WXMAC__ ) && !defined( __POWERPC__ )
typedef long double wxDouble; typedef long double wxDouble;
#else #else
typedef double wxDouble ; typedef double wxDouble ;
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -1153,6 +1153,14 @@ enum wxStretch
// standard IDs // 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 // Standard menu IDs
#define wxID_LOWEST 4999 #define wxID_LOWEST 4999

11
include/wx/menuitem.h
View File

@ -18,17 +18,6 @@
#include "wx/object.h" // base class #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 // forward declarations
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------