Merge branches/stevef/toolbars to trunk.

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

1 files changed, 25 insertions, 14 deletions

diff --git a/riscos/wimp_event.h b/riscos/wimp_event.h
index 54ae95ae5..f232291d8 100644
--- a/riscos/wimp_event.h
+++ b/riscos/wimp_event.h
@@ -1,6 +1,6 @@
 /*

  * Copyright 2005 Richard Wilson <info@tinct.net>

- * Copyright 2010 Stephen Fryatt <stevef@netsurf-browser.org>
+ * Copyright 2010, 2011 Stephen Fryatt <stevef@netsurf-browser.org>

  *

  * This file is part of NetSurf, http://www.netsurf-browser.org/

  *

@@ -31,7 +31,7 @@
 #include <stdio.h>

 #include <string.h>

 #include "oslib/os.h"

-#include "oslib/wimp.h"
+#include "oslib/wimp.h"

 #include "riscos/menus.h"

 

 #define IS_WIMP_KEY (1u<<31)

@@ -39,10 +39,17 @@
 bool ro_gui_wimp_event_memorise(wimp_w w);

 bool ro_gui_wimp_event_restore(wimp_w w);

 bool ro_gui_wimp_event_validate(wimp_w w);

+bool ro_gui_wimp_event_transfer(wimp_w from, wimp_w to);

 void ro_gui_wimp_event_finalise(wimp_w w);

+void ro_gui_wimp_event_deregister(wimp_w w, wimp_i i);

 

 bool ro_gui_wimp_event_set_help_prefix(wimp_w w, const char *help_prefix);

 const char *ro_gui_wimp_event_get_help_prefix(wimp_w w);

+bool ro_gui_wimp_event_register_help_suffix(wimp_w w,

+		const char *(*get_help_suffix)(wimp_w w, wimp_i i,

+			os_coord *pos, wimp_mouse_state buttons));

+const char *ro_gui_wimp_event_get_help_suffix(wimp_w w, wimp_i i,

+		os_coord *pos, wimp_mouse_state buttons);

 bool ro_gui_wimp_event_set_user_data(wimp_w w, void *user);

 void *ro_gui_wimp_event_get_user_data(wimp_w w);

 

@@ -52,10 +59,13 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer);
 bool ro_gui_wimp_event_keypress(wimp_key *key);

 bool ro_gui_wimp_event_open_window(wimp_open *open);

 bool ro_gui_wimp_event_close_window(wimp_w w);

-bool ro_gui_wimp_event_redraw_window(wimp_draw *redraw);
-
+bool ro_gui_wimp_event_redraw_window(wimp_draw *redraw);

+

 bool ro_gui_wimp_event_process_window_menu_click(wimp_pointer *pointer);

+bool ro_gui_wimp_event_prepare_menu(wimp_w w, wimp_i i, wimp_menu *menu);

 

+bool ro_gui_wimp_event_register_menu(wimp_w w, wimp_menu *m,

+		bool menu_auto, bool position_ibar);

 bool ro_gui_wimp_event_register_numeric_field(wimp_w w, wimp_i i, wimp_i up,

 		wimp_i down, int min, int max, int stepping,

 		int decimal_places);

@@ -80,18 +90,19 @@ bool ro_gui_wimp_event_register_close_window(wimp_w w,
 		void (*callback)(wimp_w w));

 bool ro_gui_wimp_event_register_redraw_window(wimp_w w,

 		void (*callback)(wimp_draw *redraw));

+bool ro_gui_wimp_event_register_menu_prepare(wimp_w w,

+		bool (*callback)(wimp_w w, wimp_i i, wimp_menu *m,

+		wimp_pointer *p));

 bool ro_gui_wimp_event_register_menu_selection(wimp_w w,

-		void (*callback)(wimp_w w, wimp_i i));

-bool ro_gui_wimp_event_register_window_menu(wimp_w w, wimp_menu *m,
-		void (*callback_prepare)(wimp_w w, wimp_menu *m),
-		bool (*callback_selection)(wimp_w w, wimp_menu *m,
-				wimp_selection *s, menu_action action),
-		void (*callback_close)(wimp_w w, wimp_menu *m),
-		void (*callback_warning)(wimp_w w, wimp_menu *m,
-				wimp_selection *s, menu_action action),
-		bool menu_auto);
+		bool (*callback)(wimp_w w, wimp_i i, wimp_menu *m,

+		wimp_selection *s, menu_action a));

+bool ro_gui_wimp_event_register_menu_warning(wimp_w w,

+		void (*callback)(wimp_w w, wimp_i i, wimp_menu *m,

+		wimp_selection *s, menu_action a));

+bool ro_gui_wimp_event_register_menu_close(wimp_w w,

+		void (*callback)(wimp_w w, wimp_i i, wimp_menu *m));

 

-bool ro_gui_wimp_event_submenu_warning(wimp_w w, wimp_i i, wimp_menu *menu,
+bool ro_gui_wimp_event_submenu_warning(wimp_w w, wimp_i i, wimp_menu *menu,

 		wimp_selection *selection, menu_action action);

 void ro_gui_wimp_event_menus_closed(wimp_w w, wimp_i i, wimp_menu *menu);

 void ro_gui_wimp_event_register_submenu(wimp_w w);