rationalise callback routines to use a unified interface

svn path=/trunk/netsurf/; revision=10550

1 files changed, 4 insertions, 16 deletions

diff --git a/framebuffer/fbtk_widget.h b/framebuffer/fbtk_widget.h
index c6d365712..c542c2012 100644
--- a/framebuffer/fbtk_widget.h
+++ b/framebuffer/fbtk_widget.h
@@ -42,26 +42,14 @@ struct fbtk_widget_s {
 	colour bg;
 	colour fg;
 
-	/* handlers */
-	fbtk_mouseclick_t click;
-	void *clickpw; /* private data for callback */
+        /* event callback handlers */
+	fbtk_callback callback[FBTK_CBT_END];
+	void *callback_context[FBTK_CBT_END];
 
-	fbtk_input_t input;
-	void *inputpw; /* private data for callback */
-
-	fbtk_move_t move;
-	void *movepw; /* private data for callback */
-
-	fbtk_redraw_t redraw;
-	void *redrawpw; /* private data for callback */
-
-	bool redraw_required;
+	bool redraw_required; /* the widget requires redrawing */
 
 	fbtk_widget_t *parent; /* parent widget */
 
-	fbtk_callback callback; /* event callback */
-	void *callback_context;
-
 	/* Widget specific */
 	enum fbtk_widgettype_e type;