X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=50e3279e3b5c3d753373246d88d13f7e3a0800e0;hb=319cde3c06181ba1c3619567525002926d8b4889;hp=9bdc2c0e13eba4a24eca88e585b577a2a706e996;hpb=2accd84fb2f8cc96efea8b3f27e381c2d2749160;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 9bdc2c0..50e3279 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -3,7 +3,9 @@
 
 #include <string>
 #include <msp/datafile/objectloader.h>
+#include <msp/gl/renderer.h>
 #include "geometry.h"
+#include "partcache.h"
 #include "state.h"
 
 namespace Msp {
@@ -48,14 +50,13 @@ protected:
 	bool focusable;
 	Container *parent;
 	std::string tooltip;
+	PartCache part_cache;
 
 	Widget();
 public:
 	virtual ~Widget();
 
-	/**
-	Returns the name of the widget class.  Used for style lookup.
-	*/
+	/// Returns the name of the widget class.  Used for style lookup.
 	virtual const char *get_class() const { return "widget"; }
 
 	void set_position(int, int);
@@ -65,26 +66,21 @@ public:
 	const Geometry &get_geometry() const { return geom; }
 
 protected:
-	/**
-	Sets the widget's parent Container.  The widget must be unparented when
-	calling this function with a non-null parameter.
-	*/
+	/** Sets the widget's parent Container.  The widget must be unparented when
+	calling this function with a non-null parameter. */
 	void set_parent(Container *);
 public:
 	Container *get_parent() const { return parent; }
 
-	/**
-	Sets the widget style.  The final style name is constructed by concatenating
-	the widget class and the style name with a dash.
-	*/
+	/** Sets the widget style.  The name of the resource to be looked up is
+	constructed by concatenating the widget class and the style name with a
+	dash. */
 	void set_style(const std::string &);
 	const Style &get_style() const { return *style; }
 
 protected:
-	/**
-	Gets a style object from the resource collection based on the class and
-	style names of the widget.
-	*/
+	/** Gets a style object from the resource collection based on the class and
+	style names of the widget. */
 	void update_style();
 
 public:
@@ -102,10 +98,13 @@ protected:
 	void clear_state(State s) { set_state(s, NORMAL); }
 	void set_state(State, State);
 
+	void rebuild();
+	virtual void rebuild_special(const Part &);
+
 public:
-	void render() const;
+	void render(GL::Renderer &) const;
 protected:
-	virtual void render_special(const Part &) const { }
+	virtual void render_special(const Part &, GL::Renderer &) const { }
 
 public:
 	// Events