merging back XTI branch part 2

[wxWidgets.git] / include / wx / flags.h

diff --git a/include/wx/flags.h b/include/wx/flags.h
index def2feb0d848c3169b999036cfe296c9550ded42..0b2ffe8dc8cbea9b43b6197d3aacbbe13db14fd1 100644 (file)
--- a/include/wx/flags.h
+++ b/include/wx/flags.h
@@ -153,7 +153,9 @@ private :
     unsigned long m_data;
 };
 
     unsigned long m_data;
 };
 

-#define WX_DEFINE_FLAGS( flags ) \
+#if wxUSE_EXTENDED_RTTI
+
+#define wxDEFINE_FLAGS( flags ) \

     class WXDLLIMPEXP_BASE flags \
     {\
     public : \
     class WXDLLIMPEXP_BASE flags \
     {\
     public : \


@@ -162,4 +164,14 @@ private :
         bool operator ==(const flags &rhs) const { return m_data == rhs.m_data; }\
     } ;
 
         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
 #endif