X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstate.cpp;h=556970d561c13b3c624ef307de2cf9ed53ef5d9d;hb=c8291177b545ec81930603a5915234a60296db51;hp=368e69350156337f7e48d2c6a2aaaad8d4f2239a;hpb=c2635c5a3dca6a6cea5562fd387beb0662b18cf0;p=libs%2Fgltk.git

diff --git a/source/state.cpp b/source/state.cpp
index 368e693..556970d 100644
--- a/source/state.cpp
+++ b/source/state.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "state.h"
 
 using namespace std;
@@ -16,16 +9,33 @@ istream &operator>>(istream &is, State &state)
 {
 	string str;
 	is>>str;
-	if(str=="NORMAL")
-		state=NORMAL;
-	else if(str=="HOVER")
-		state=HOVER;
-	else if(str=="ACTIVE")
-		state=ACTIVE;
-	else if(str=="DISABLED")
-		state=DISABLED;
-	else
-		is.setstate(ios_base::failbit);
+
+	unsigned start = 0;
+	state = NORMAL;
+
+	while(1)
+	{
+		string::size_type underscore = str.find('_', start);
+		if(!str.compare(start, underscore-start, "NORMAL"))
+			state |= NORMAL;
+		else if(!str.compare(start, underscore-start, "HOVER"))
+			state |= HOVER;
+		else if(!str.compare(start, underscore-start, "ACTIVE"))
+			state |= ACTIVE;
+		else if(!str.compare(start, underscore-start, "FOCUS"))
+			state |= FOCUS;
+		else if(!str.compare(start, underscore-start, "DISABLED"))
+			state |= DISABLED;
+		else
+		{
+			is.setstate(ios_base::failbit);
+			break;
+		}
+
+		if(underscore==std::string::npos)
+			break;
+		start = underscore+1;
+	}
 
 	return is;
 }