X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.h;h=844fe88c30fe786d9c460030f35a87ad11f78a10;hb=3bdb7fd6873ca45ce7e7754040b69b0d941eef31;hp=e99f16b2503ac568d589928d2ae1729c517d2aee;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/button.h b/source/button.h
index e99f16b..844fe88 100644
--- a/source/button.h
+++ b/source/button.h
@@ -16,7 +16,7 @@ in a spacial part "text".
 class Button: public Widget
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Button, Widget::Loader>
 	{
 	public:
 		Loader(Button &);
@@ -36,18 +36,21 @@ public:
 
 	virtual const char *get_class() const { return "button"; }
 
-	virtual void autosize();
+private:
+	virtual void autosize_special(const Part &, Geometry &) const;
 
+public:
 	void set_text(const std::string &);
 	void set_icon(const GL::Texture2D *);
 
 private:
-	virtual void rebuild_special(const Part &, CachedPart &);
+	virtual void rebuild_special(const Part &);
 
 public:
 	virtual void button_press(int, int, unsigned);
 	virtual void button_release(int, int, unsigned);
 	virtual void pointer_motion(int, int);
+	virtual bool navigate(Navigation);
 private:
 	virtual void on_style_change();
 };