X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=5c81b8056e6f409641095b2303513a95eff4d3ae;hb=d2d5b4c4dedf90a42dd2baff8334318b1d000f64;hp=270d2a3f67eb2e1d890dbfc1426a8adac65fe0db;hpb=fdc7fecc65f5f517d66abe3546a949a46836c4a6;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 270d2a3..5c81b80 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -50,44 +50,40 @@ protected:
 	bool focusable;
 	Container *parent;
 	std::string tooltip;
-	std::list<CachedPart> cached_parts;
+	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);
 	void set_size(unsigned, unsigned);
-	virtual void autosize();
+	void autosize();
+protected:
+	virtual void autosize_special(const Part &, Geometry &) { }
+public:
 	void set_geometry(const Geometry &);
 	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:
@@ -106,7 +102,7 @@ protected:
 	void set_state(State, State);
 
 	void rebuild();
-	virtual void rebuild_special(const Part &, CachedPart &) { }
+	virtual void rebuild_special(const Part &);
 
 public:
 	void render(GL::Renderer &) const;