X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=270d2a3f67eb2e1d890dbfc1426a8adac65fe0db;hb=3d84860cb25cf05ed36ee6cbd07d9e58cee52422;hp=3653970a2f470e4a03ad6ff66af225802eafeb93;hpb=b92c878a286036af106e969a29b2689876aa5f65;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 3653970..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 {
@@ -55,6 +50,7 @@ protected:
 	bool focusable;
 	Container *parent;
 	std::string tooltip;
+	std::list<CachedPart> cached_parts;
 
 	Widget();
 public:
@@ -104,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
@@ -115,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: