Store the Resources reference only in Root widget

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

diff --git a/source/widget.h b/source/widget.h
index 2fdc68c34c778e34f4ebf72ba237921eeb2f54fb..d5bc0ff04c232504a657275b956b9f14c3ec36de 100644 (file)
--- a/source/widget.h
+++ b/source/widget.h
@@ -47,7 +47,6 @@ public:
        sigc::signal<void> signal_ungrab_pointer;
 
 protected:
-       const Resources &res;
        Geometry geom;
        std::string style_name;
        const Style *style;
@@ -57,7 +56,7 @@ protected:
        Container *parent;
        std::string tooltip;
 
-       Widget(const Resources &);
+       Widget();
 public:
        virtual ~Widget();
 
@@ -111,6 +110,8 @@ protected:
        */
        void update_style();
 
+       static void update_style(Widget &);
+
        /**
        Sets the widget's parent Panel.  The widget must be unparented when calling
        this function with a nonzero parameter.
@@ -120,7 +121,7 @@ protected:
        /**
        A helper function to set the parent of another widget.
        */
-       void set_parent(Widget &, Container *);
+       static void set_parent(Widget &, Container *);
 
        // More events
        virtual void on_geometry_change() { }