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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 676b0ace7b0c8d7ac4f7e2978a52f74e83d22524..2452b337ccad0fdefeaca2afb512fde105927bbc 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -604,15 +604,15 @@ enum
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)

-       typedef short double    wxFloat64;
+    typedef short double       wxFloat64;

 #else
 #else

-       typedef double                  wxFloat64;
+    typedef double                     wxFloat64;

 #endif
 
 #if defined( __WXMAC__ )  && !defined( __POWERPC__ )
 #endif
 
 #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
 #define wxID_LOWEST             4999
 
 // Standard menu IDs
 #define wxID_LOWEST             4999
 

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 6fda4bd30dad28cdcb38582f506f2dcd4c1a8f3f..b80497652208d9d3559f3d1212205120c690fa8a 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -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
 // ----------------------------------------------------------------------------