Minor refactoring

[libs/gltk.git] / source / part.h

diff --git a/source/part.h b/source/part.h
index a3c0dcf4a109eb045c162a4f007c5b937d911d81..10eef5ff2ac329e4214ab33c48092d97fb8690ee 100644 (file)
--- a/source/part.h
+++ b/source/part.h
@@ -1,40 +1,33 @@
-/* $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,7 +37,7 @@ public:
 
 private:
        std::string name;
-       const Graphic *graphic[N_STATES_];
+       const Graphic *graphic[N_STATES_] = { };
        Geometry geom;
        Sides margin;
        Alignment align;
@@ -56,7 +49,7 @@ public:
        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