X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.h;h=1e79165fd4f02af21af122262de1ac7929cd411a;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=a3c0dcf4a109eb045c162a4f007c5b937d911d81;hpb=2f70d404230954f0693a62a021b5d2ad1faed8fa;p=libs%2Fgltk.git

diff --git a/source/part.h b/source/part.h
index a3c0dcf..1e79165 100644
--- a/source/part.h
+++ b/source/part.h
@@ -1,40 +1,34 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_PART_H_
 #define MSP_GLTK_PART_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
+#include "mspgltk_api.h"
 #include "state.h"
 
 namespace Msp {
 namespace GLtk {
 
 class Graphic;
+class PartCache;
 class Resources;
 
 /**
 Defines a single graphical element of a widget style.
 */
-class Part
+class MSPGLTK_API Part
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Part>
 	{
-	private:
-		Part &part;
-		Resources &res;
-
 	public:
 		Loader(Part &, Resources &);
-		~Loader();
+
 	private:
+		void finish() override;
+
+		void graphic_normal(const std::string &);
 		void graphic(State, const std::string &);
 		void align(float, float);
 		void fill(float, float);
@@ -44,19 +38,20 @@ public:
 
 private:
 	std::string name;
-	const Graphic *graphic[N_STATES_];
+	const Graphic *graphic[N_STATES_] = { };
 	Geometry geom;
 	Sides margin;
 	Alignment align;
 
 public:
 	Part(const std::string &);
+
 	const std::string &get_name() const { return name; }
 	const Graphic *get_graphic(State) const;
 	const Geometry &get_geometry() const { return geom; }
 	const Sides &get_margin() const { return margin; }
 	const Alignment &get_alignment() const { return align; }
-	void render(const Geometry &, State) const;
+	void build(const Geometry &, State, PartCache &) const;
 };
 
 } // namespace GLtk