Rework how widget ownership works in Container

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

diff --git a/source/part.h b/source/part.h
index edc524c0b67b62d1807b46eb6f271983d92de090..1e79165fd4f02af21af122262de1ac7929cd411a 100644 (file)
--- a/source/part.h
+++ b/source/part.h
@@ -1,42 +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 <map>
 #include <string>
-#include <msp/datafile/loader.h>
-//#include "alignment.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);
@@ -46,21 +38,21 @@ 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;
 };
-typedef std::list<Part> PartSeq;
 
 } // namespace GLtk
 } // namespace Msp