Change the Resources reference in Root to non-const

It might be necessary to load textures on the fly.

diff --git a/source/root.cpp b/source/root.cpp
index e867fae63653ebf39f10e4398fa5c5f83d3a301a..e9e62f6785c3a203914dfb10594d1a0db74c812d 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -13,7 +13,7 @@
 namespace Msp {
 namespace GLtk {
 
-Root::Root(const Resources &r, Graphics::Window &window):
+Root::Root(Resources &r, Graphics::Window &window):
        resources(r),
        keyboard(new Input::Keyboard(window)),
        input_method(0),
@@ -24,7 +24,7 @@ Root::Root(const Resources &r, Graphics::Window &window):
        init(&window);
 }
 
-Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
+Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
        resources(r),
        keyboard(k),
        input_method(0),

diff --git a/source/root.h b/source/root.h
index aeb2b9bb692d7ee78ad0414b36825a2873c5983a..5dbf7bb1aa112a317f59763ac6fd9c8ccb7bad9a 100644 (file)
--- a/source/root.h
+++ b/source/root.h
@@ -29,7 +29,7 @@ public:
        sigc::signal<std::string, int, int> signal_tooltip;
 
 private:
-       const Resources &resources;
+       Resources &resources;
        Input::Keyboard *keyboard;
        InputMethod *input_method;
        Input::Mouse *mouse;
@@ -46,11 +46,11 @@ private:
 public:
        /** Creates a Root widget for a window.  The geometry is set to match the
        window's size, and input devices are created automatically. */
-       Root(const Resources &, Graphics::Window &);
+       Root(Resources &, Graphics::Window &);
 
        /** Creates a Root widget with custom input devices.  If window is not null,
        it is used to set the widget's initial geometry. */
-       Root(const Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
+       Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
 private:
        void init(Graphics::Window *);
 public:
@@ -58,7 +58,7 @@ public:
 
        virtual const char *get_class() const { return "root"; }
 
-       const Resources &get_resources() const { return resources; }
+       Resources &get_resources() const { return resources; }
        virtual unsigned get_width() const { return geom.w; }
        virtual unsigned get_height() const { return geom.h; }