Minor style fixes

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

diff --git a/source/resources.h b/source/resources.h
index 3d39393bac979b144f54d152d73dc69563355c5e..87b8364148053581d142070d274fe24439f1e47c 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -4,19 +4,20 @@
 #include <msp/gl/font.h>
 #include <msp/gl/texture.h>
 #include <msp/datafile/collection.h>
-#include <msp/path/path.h>
+#include <msp/datafile/directorysource.h>
+#include <msp/fs/path.h>
 #include "graphic.h"
 #include "style.h"
 
 namespace Msp {
 namespace GLtk {
 
+/**
+Stores resources such as styles and graphics.  All widgets require a Resources
+instance in constructor.
+*/
 class Resources: public DataFile::Collection
 {
-private:
-       Path path;
-       GL::Font *default_font;
-
 public:
        class Loader: public Collection::Loader
        {
@@ -30,12 +31,22 @@ public:
                void font(const std::string &);
        };
 
+private:
+       FS::Path path;
+       GL::Font *default_font;
+       DataFile::DirectorySource *dir_src;
+
+public:
        Resources();
+       Resources(const FS::Path &);
+private:
+       void init();
+public:
+       ~Resources();
 
-       void set_path(const Path &);
        const GL::Font &get_default_font() const;
+
 private:
-       GL::Font *create_font(const std::string &);
        GL::Texture2D *create_texture(const std::string &);
 };