X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.h;h=87b8364148053581d142070d274fe24439f1e47c;hb=1bc84ded58379ee24315db8784d9fb710a02e24e;hp=3d39393bac979b144f54d152d73dc69563355c5e;hpb=4d1dbf9ab44b915c4f35855cb70742e8fc834d12;p=libs%2Fgltk.git

diff --git a/source/resources.h b/source/resources.h
index 3d39393..87b8364 100644
--- 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 &);
 };