X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=270d2a3f67eb2e1d890dbfc1426a8adac65fe0db;hb=9fdbf99cdb3c5620e665c3ecb34e83d778cb311a;hp=5522ba340e60a580e21497feeba50daee03cd632;hpb=43ac7c4514658754d09552463425bcd344fb9ded;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 5522ba3..270d2a3 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -1,16 +1,11 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_WIDGET_H_
 #define MSP_GLTK_WIDGET_H_
 
 #include <string>
 #include <msp/datafile/objectloader.h>
+#include <msp/gl/renderer.h>
 #include "geometry.h"
+#include "partcache.h"
 #include "state.h"
 
 namespace Msp {
@@ -41,6 +36,7 @@ public:
 	};
 
 	sigc::signal<void, bool> signal_visibility_changed;
+	sigc::signal<void> signal_autosize_changed;
 	sigc::signal<void> signal_request_focus;
 	sigc::signal<void> signal_grab_pointer;
 	sigc::signal<void> signal_ungrab_pointer;
@@ -54,6 +50,7 @@ protected:
 	bool focusable;
 	Container *parent;
 	std::string tooltip;
+	std::list<CachedPart> cached_parts;
 
 	Widget();
 public:
@@ -103,9 +100,18 @@ public:
 	bool is_focusable() const { return focusable; }
 	void set_focus();
 
-	void render() const;
 protected:
-	virtual void render_special(const Part &) const { }
+	void set_state(State s) { set_state(s, s); }
+	void clear_state(State s) { set_state(s, NORMAL); }
+	void set_state(State, State);
+
+	void rebuild();
+	virtual void rebuild_special(const Part &, CachedPart &) { }
+
+public:
+	void render(GL::Renderer &) const;
+protected:
+	virtual void render_special(const Part &, GL::Renderer &) const { }
 
 public:
 	// Events
@@ -114,8 +120,9 @@ public:
 	virtual void pointer_motion(int, int) { }
 	virtual void pointer_enter();
 	virtual void pointer_leave();
-	virtual void key_press(unsigned, unsigned, wchar_t) { }
+	virtual void key_press(unsigned, unsigned) { }
 	virtual void key_release(unsigned, unsigned) { }
+	virtual void character(wchar_t) { }
 	virtual void focus_in();
 	virtual void focus_out();
 protected: