Fix a crash if the linear program contains an empty column

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

diff --git a/source/resources.h b/source/resources.h
index cf8116dbc7392f1eb9a60d51df959c081040db48..52da3952916fb780cb873716d30f9381b86824d1 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -4,17 +4,21 @@
 #include <msp/gl/font.h>
 #include <msp/gl/texture.h>
 #include <msp/datafile/collection.h>
-#include <msp/path/path.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;
+       FS::Path path;
        GL::Font *default_font;
 
 public:
@@ -26,12 +30,18 @@ public:
        public:
                Loader(Resources &);
        private:
+               void default_font(const std::string &);
                void font(const std::string &);
+               void style(const std::string &);
        };
 
        Resources();
+       Resources(const FS::Path &);
+private:
+       void init();
 
-       void set_path(const Path &);
+public:
+       void set_path(const FS::Path &);
        const GL::Font &get_default_font() const;
 private:
        GL::Font *create_font(const std::string &);