From 8da644f44279d4e566a77f4227173915ff49a7c6 Mon Sep 17 00:00:00 2001
From: Adrian Lees <adrian@aemulor.com>
Date: Thu, 21 Apr 2005 21:36:23 +0000
Subject: [project @ 2005-04-21 21:36:23 by adrianl] Dragging URLs into toolbar
 URL icon; keyboard actions in textareas conform to Wimp's icon editing;
 display of scale % fixed for 120%

svn path=/import/netsurf/; revision=1676
---
 riscos/gui.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'riscos/gui.c')

diff --git a/riscos/gui.c b/riscos/gui.c
index 2e9a92db7..0d35ed78d 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -105,6 +105,8 @@
 #endif
 
 
+int os_version = 0;
+
 const char *__dynamic_da_name = "NetSurf";	/**< For UnixLib. */
 int __dynamic_da_max_size = 128 * 1024 * 1024;	/**< For UnixLib. */
 int __feature_imagefs_is_file = 1;		/**< For UnixLib. */
@@ -230,6 +232,10 @@ void gui_init(int argc, char** argv)
 
 	xhourglass_start(1);
 
+	/* read OS version for code that adapts to conform to the OS (remember
+		that it's preferable to check for specific features being present) */
+	xos_byte(osbyte_IN_KEY, 0, 0xff, &os_version, NULL);
+
 	atexit(ro_gui_cleanup);
 	signal(SIGABRT, ro_gui_signal);
 	signal(SIGFPE, ro_gui_signal);
@@ -1322,8 +1328,15 @@ void ro_msg_dataload(wimp_message *message)
 	bool tree_edit = false;
 
 	g = ro_gui_window_lookup(message->data.data_xfer.w);
-	if (g && ro_gui_window_dataload(g, message))
-		return;
+	if (g) {
+		if (ro_gui_window_dataload(g, message))
+			return;
+	}
+	else {
+		g = ro_gui_toolbar_lookup(message->data.data_xfer.w);
+		if (g && ro_gui_toolbar_dataload(g, message))
+			return;
+	}
 
 	switch (file_type) {
 		case FILETYPE_ACORN_URI:
-- 
cgit v1.2.3