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

diff --git a/source/style.h b/source/style.h
index 47cdabb..bc210a2 100644
--- a/source/style.h
+++ b/source/style.h
@@ -1,9 +1,9 @@
 #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 {
@@ -16,27 +16,30 @@ 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 &);
 	};
 
-	Style(const Resources &, const std::string &, const std::string &);
+	Style();
 	const GL::Font *get_font() const  { return font; }
-	const Color    &get_font_color() const { return font_color; }
-	const PartSeq  &get_parts() const { return parts; }
+	const GL::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;
 };
 
 } // namespace GLtk