Added wxRichTextTableBlock class to help with table UI operations

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

diff --git a/include/wx/flags.h b/include/wx/flags.h
index cd5b2e3dba4d9ee14b0e26826f2f17bb254e8117..c45bafabdc89ed0442c83e8b2e89124858f5f573 100644 (file)
--- a/include/wx/flags.h
+++ b/include/wx/flags.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +11,6 @@
 #ifndef _WX_SETH__
 #define _WX_SETH__
 
 #ifndef _WX_SETH__
 #define _WX_SETH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "flags.h"
-#endif
-

 // wxBitset should be applied to an enum, then this can be used like
 // bitwise operators but keeps the type safety and information, the
 // enums must be in a sequence , their value determines the bit position
 // wxBitset should be applied to an enum, then this can be used like
 // bitwise operators but keeps the type safety and information, the
 // enums must be in a sequence , their value determines the bit position


@@ -157,8 +152,10 @@ private :
     unsigned long m_data;
 };
 
     unsigned long m_data;
 };
 

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

     {\
     public : \
         flags(long data=0) :m_data(data) {} \
     {\
     public : \
         flags(long data=0) :m_data(data) {} \


@@ -166,4 +163,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