X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae820c693aa5eaa6923a51ad1361c55095ff8900..dcc19b5b38ee397de186d3d181705a9ad7e3447d:/include/wx/flags.h

diff --git a/include/wx/flags.h b/include/wx/flags.h
index ec14d2c2b9..d0b7c82c8b 100644
--- a/include/wx/flags.h
+++ b/include/wx/flags.h
@@ -16,102 +16,154 @@
 #pragma interface "flags.h"
 #endif
 
-// wxFlags should be applied to an enum, then this can be used like
+// 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
 // that they represent
+// The api is made as close as possible to <bitset> 
 
-template <class T> class wxFlags
+template <class T> class wxBitset
 {
 	friend class wxEnumData ;
 public:
-    wxFlags(long val) { m_data = val ; }
-    wxFlags() { m_data = 0; }
-    wxFlags(const wxFlags &src) { m_data = src.m_data; }
-    wxFlags(const T el) { m_data |= 1 << el; }
+    // creates a wxBitset<> object with all flags initialized to 0
+    wxBitset() { m_data = 0; }
 
-    operator long() const { return m_data ; }
+    // created a wxBitset<> object initialized according to the bits of the 
+    // integral value val
+    wxBitset(unsigned long val) { m_data = val ; }
 
-    wxFlags &operator =(const wxFlags &rhs)
+    // copies the content in the new wxBitset<> object from another one
+    wxBitset(const wxBitset &src) { m_data = src.m_data; }
+
+    // creates a wxBitset<> object that has the specific flag set
+    wxBitset(const T el) { m_data |= 1 << el; }
+
+    // returns the integral value that the bits of this object represent
+    unsigned long to_ulong() const { return m_data ; }
+
+    // assignment
+    wxBitset &operator =(const wxBitset &rhs)
     {
 		m_data = rhs.m_data;
 		return *this;
     }
-    wxFlags &operator +=(const wxFlags &rhs) // union
+
+    // bitwise or operator, sets all bits that are in rhs and leaves
+    // the rest unchanged
+    wxBitset &operator |=(const wxBitset &rhs) 
     {
 		m_data |= rhs.m_data;
 		return *this;
     }
-    wxFlags &operator -=(const wxFlags &rhs) // difference
+
+    // bitwsie exclusive-or operator, toggles the value of all bits
+    // that are set in bits and leaves all others unchanged
+    wxBitset &operator ^=(const wxBitset &rhs) // difference
     {
 		m_data ^= rhs.m_data;
 		return *this;
     }
 
-    wxFlags &operator *=(const wxFlags &rhs) // intersection
+    // bitwise and operator, resets all bits that are not in rhs and leaves
+    // all others unchanged
+    wxBitset &operator &=(const wxBitset &rhs) // intersection
     {
 		m_data &= rhs.m_data;
 		return *this;
     }
 
-    wxFlags operator +(const wxFlags &rhs) const // union
+    // bitwise or operator, returns a new bitset that has all bits set that set are in 
+    // bitset2 or in this bitset
+   wxBitset operator |(const wxBitset &bitset2) const // union
     {
-		wxFlags<T> s;
-		s.m_data = m_data | rhs.m_data;
+		wxBitset<T> s;
+		s.m_data = m_data | bitset2.m_data;
 		return s;
     }
-    wxFlags operator -(const wxFlags &rhs) const // difference
+
+    // bitwise exclusive-or operator, returns a new bitset that has all bits set that are set either in 
+    // bitset2 or in this bitset but not in both
+    wxBitset operator ^(const wxBitset &bitset2) const // difference
     {
-		wxFlags<T> s;
-		s.m_data = m_data ^ rhs.m_data;
+		wxBitset<T> s;
+		s.m_data = m_data ^ bitset2.m_data;
 		return s;
     }
-    wxFlags operator *(const wxFlags &rhs) const // intersection
+
+    // bitwise and operator, returns a new bitset that has all bits set that are set both in 
+    // bitset2 and in this bitset
+    wxBitset operator &(const wxBitset &bitset2) const // intersection
     {
-		wxFlags<T> s;
-		s.m_data = m_data & rhs.m_data;
+		wxBitset<T> s;
+		s.m_data = m_data & bitset2.m_data;
 		return s;
     }
 
-    wxFlags& Set(const T el) //Add element
+    // sets appropriate the bit to true
+    wxBitset& set(const T el) //Add element
     {
 		m_data |= 1 << el;
 		return *this;
     }
-    wxFlags& Clear(const T el) //remove element
+    
+    // clears the appropriate flag to false
+    wxBitset& reset(const T el) //remove element
     {
 		m_data &= ~(1 << el);
 		return *this;
     }
 
-    bool Contains(const T el) const
+    // clear all flags
+    wxBitset& reset()
     {
-		return (m_data & (1 << el)) ? true : false;
+		m_data = 0;
+		return *this;
     }
 
-    wxFlags &Clear()
+    // true if this flag is set
+    bool test(const T el) const
     {
-		m_data = 0;
-		return *this;
+		return (m_data & (1 << el)) ? true : false;
     }
 
-    bool Empty() const
+    // true if no flag is set
+    bool none() const
     {
 		return m_data == 0;
     }
 
-    bool operator ==(const wxFlags &rhs) const
+    // true if any flag is set
+    bool any() const
+    {
+		return m_data != 0;
+    }
+
+    // true if both have the same flags
+    bool operator ==(const wxBitset &rhs) const
     {
 		return m_data == rhs.m_data;
     }
 
-    bool operator !=(const wxFlags &rhs) const
+    // true if both differ in their flags set
+    bool operator !=(const wxBitset &rhs) const
     {
 		return !operator==(rhs);
     }
+
+    bool operator[] (const T el) const { return test(el) ; }
+
 private :
-	int m_data;
+	unsigned long m_data;
 };
 
+#define WX_DEFINE_FLAGS( flags ) \
+    class WXDLLEXPORT flags \
+    {\
+    public : \
+        flags(long data=0) :m_data(data) {} \
+        long m_data ;\
+        bool operator ==(const flags &rhs) const { return m_data == rhs.m_data; }\
+    } ;
 
 #endif