X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=f17735f05e07c7efb4a3aa88c9e4bb6f4db79724;hb=ed9873ba7ee862ad76937f579fe371c1a27d5715;hp=47cdabba88b74ec254e5df4d45ff48fa4abdf324;hpb=131ac8ff2c06f94d40f4bf98d4a6ec0d113cdffc;p=libs%2Fgltk.git

diff --git a/source/style.h b/source/style.h
index 47cdabb..f17735f 100644
--- a/source/style.h
+++ b/source/style.h
@@ -1,9 +1,16 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef MSP_GLTK_STYLE_H_
 #define MSP_GLTK_STYLE_H_
 
+#include <msp/gl/color.h>
 #include <msp/gl/font.h>
 #include <msp/datafile/loader.h>
-#include "color.h"
 #include "part.h"
 
 namespace Msp {
@@ -11,32 +18,42 @@ namespace GLtk {
 
 class Resources;
 
+/**
+Styles define what wigets look like.  They are made up of Parts and some
+generic properties.
+*/
 class Style
 {
 public:
 	class Loader: public DataFile::Loader
 	{
-	public:
-		Loader(Style &);
 	private:
 		Style &style;
+		Resources &res;
+
+	public:
+		typedef Resources Collection;
 
+		Loader(Style &, Resources &);
+		Style &get_object() const { return style; }
+		Resources &get_collection() const { return res; }
+	private:
 		void font(const std::string &);
 		void font_color(float, float, float);
-		void part(const std::string &);
+		void part();
+		void special(const std::string &);
 	};
 
-	Style(const Resources &, const std::string &, const std::string &);
-	const GL::Font *get_font() const  { return font; }
-	const Color    &get_font_color() const { return font_color; }
-	const PartSeq  &get_parts() const { return parts; }
 private:
-	const Resources &res;
-	std::string widget;
-	std::string name;
 	const GL::Font *font;
-	Color font_color;
-	PartSeq  parts;
+	GL::Color font_color;
+	PartSeq parts;
+
+public:
+	Style(Resources &);
+	const GL::Font *get_font() const  { return font; }
+	const GL::Color &get_font_color() const { return font_color; }
+	const PartSeq &get_parts() const { return parts; }
 };
 
 } // namespace GLtk