X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=672a7eaa202a129d0771190f411d1a3c3a4cef2e;hb=754751fd474c6eac073fa7e89a18142fc89cb4fb;hp=8aeb61e8ef68f26a61b82acaf97d6e8398a14269;hpb=787dd5572e904a87686e7309401b86e0c528d823;p=libs%2Fgltk.git

diff --git a/source/style.h b/source/style.h
index 8aeb61e..672a7ea 100644
--- a/source/style.h
+++ b/source/style.h
@@ -1,16 +1,9 @@
-/* $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 <msp/datafile/objectloader.h>
 #include "part.h"
 
 namespace Msp {
@@ -25,33 +18,30 @@ generic properties.
 class Style
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Style, Resources>
 	{
-	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();
 		void part(const std::string &);
+		void unnamed_part();
 	};
 
+	typedef std::list<Part> PartSeq;
+
 private:
 	const GL::Font *font;
+	unsigned font_size;
 	GL::Color font_color;
 	PartSeq parts;
 
 public:
-	Style(Resources &);
-	const GL::Font *get_font() const  { return font; }
+	Style();
+	const GL::Font &get_font() const;
+	unsigned get_font_size() const { return font_size; }
 	const GL::Color &get_font_color() const { return font_color; }
 	const PartSeq &get_parts() const { return parts; }
 	const Part *get_part(const std::string &) const;