Loader improvements

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

diff --git a/source/part.h b/source/part.h
index a94f29db87421d5fdff157cbae4462f89884f1d6..5fe07a4f07d17aa96e121c4eeec1cbabb76b035d 100644 (file)
--- a/source/part.h
+++ b/source/part.h
@@ -8,10 +8,8 @@ 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 "state.h"
 
@@ -27,20 +25,17 @@ Defines a single graphical element of a widget style.
 class 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 graphic(State, const std::string &);
                void align(float, float);
-               void fill(bool, bool);
+               void fill(float, float);
                void margin();
+               void size(unsigned, unsigned);
        };
 
 private:
@@ -49,8 +44,6 @@ private:
        Geometry geom;
        Sides margin;
        Alignment align;
-       bool fill_x;
-       bool fill_y;
 
 public:
        Part(const std::string &);
@@ -59,11 +52,8 @@ public:
        const Geometry &get_geometry() const { return geom; }
        const Sides &get_margin() const { return margin; }
        const Alignment &get_alignment() const { return align; }
-       bool get_fill_x() const { return fill_x; }
-       bool get_fill_y() const { return fill_y; }
        void render(const Geometry &, State) const;
 };
-typedef std::list<Part> PartSeq;
 
 } // namespace GLtk
 } // namespace Msp