Derive Resources from DataFile::Collection

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

diff --git a/source/style.h b/source/style.h
index 47cdabba88b74ec254e5df4d45ff48fa4abdf324..bc210a23fd7ff00a251a9d58c91caa840bea782f 100644 (file)
--- a/source/style.h
+++ b/source/style.h
@@ -1,9 +1,9 @@
 #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 "color.h"
 #include "part.h"
 
 namespace Msp {
@@ -16,27 +16,30 @@ class Style
 public:
        class Loader: public DataFile::Loader
        {
-       public:
-               Loader(Style &);
        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(const std::string &);
        };
 
-       Style(const Resources &, const std::string &, const std::string &);
+       Style();
        const GL::Font *get_font() const  { return font; }
-       const Color    &get_font_color() const { return font_color; }
-       const PartSeq  &get_parts() const { return parts; }
+       const GL::Color &get_font_color() const { return font_color; }
+       const PartSeq &get_parts() const { return parts; }
 private:
-       const Resources &res;
-       std::string widget;
-       std::string name;
        const GL::Font *font;
-       Color font_color;
-       PartSeq  parts;
+       GL::Color font_color;
+       PartSeq parts;
 };
 
 } // namespace GLtk