X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstate.h;h=51d17b2bb758fa14e08186c815fc565612148373;hb=56c41b294aa47a38ac3e1be70d4868f260cb4274;hp=6cbe152ead5fdbd41a230b1cf668b2c5f9c9bad8;hpb=c1f038acb91eb3bfaa34dfd4729d19ed3f871a42;p=libs%2Fgltk.git

diff --git a/source/state.h b/source/state.h
index 6cbe152..51d17b2 100644
--- a/source/state.h
+++ b/source/state.h
@@ -2,30 +2,40 @@
 #define MSP_GLTK_STATE_H_
 
 #include <istream>
-#include <msp/parser/value.h>
+#include <msp/datafile/value.h>
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
 
 enum State
 {
-	NORMAL,   //< Default state
-	HOVER,    //< Pointer over the widget
-	ACTIVE,   //< Widget is active (e.g. pressed button)
-	DISABLED, //< Widget is unresponsive
-	N_STATES_ //< Sentry value
+	NORMAL = 0,   //< Default state
+	HOVER = 1,    //< Pointer over the widget
+	ACTIVE = 2,   //< Widget is active (e.g. pressed button)
+	FOCUS = 4,    //< Widget has input focus
+	DISABLED = 8, //< Widget is unresponsive
+	N_STATES_ = 16 //< Sentry value
 };
 
-extern std::istream &operator>>(std::istream &, State &);
+inline State operator|(State a, State b)
+{ return static_cast<State>(static_cast<int>(a)|static_cast<int>(b)); }
 
-} // namespace GLtk
+inline State operator|=(State &a, State b)
+{ a = a|b; return a; }
+
+inline State operator&(State a, State b)
+{ return static_cast<State>(static_cast<int>(a)&static_cast<int>(b)); }
 
-namespace Parser {
+inline State operator&=(State &a, State b)
+{ a = a&b; return a; }
 
-template<>
-struct TypeResolver<GLtk::State> { static const Value::Type type=Value::ENUM; };
+inline State operator~(State a)
+{ return static_cast<State>(~static_cast<int>(a)); }
 
-} // namespace Parser
+MSPGLTK_API std::istream &operator>>(std::istream &, State &);
+
+} // namespace GLtk
 } // namespace Msp
 
 #endif