merging back XTI branch part 2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/flags.h

@@ -153,7 +153,9 @@ private :
     unsigned long m_data;
 };
 
-#define WX_DEFINE_FLAGS( flags ) \
+#if wxUSE_EXTENDED_RTTI
+
+#define wxDEFINE_FLAGS( flags ) \
     class WXDLLIMPEXP_BASE flags \
     {\
     public : \
@@ -162,4 +164,14 @@ private :
         bool operator ==(const flags &rhs) const { return m_data == rhs.m_data; }\
     } ;
 
+#else
+
+#define wxDEFINE_FLAGS( flags )
+
+#endif
+
+#if WXWIN_COMPATIBILITY_2_8
+    #define WX_DEFINE_FLAGS     wxDEFINE_FLAGS
+#endif
+
 #endif