From ac70da346ceb71f4e588e6645e320c8a69742365 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 16 Oct 2014 09:50:55 +0100 Subject: Update the RISC OS frontend to cope with split operations table headers --- riscos/401login.c | 7 +++---- riscos/download.c | 20 +++++++++++--------- riscos/global_history.c | 12 +++++++----- riscos/gui.c | 3 ++- riscos/hotlist.c | 10 +++++----- riscos/menus.c | 6 +++--- riscos/save.c | 2 +- riscos/search.c | 13 +++++++------ riscos/sslcert.c | 7 +++---- riscos/textselection.c | 3 ++- riscos/theme.c | 13 ++++++------- riscos/toolbar.c | 9 +++++---- riscos/ucstables.c | 2 +- riscos/uri.c | 12 ++++++------ riscos/url_protocol.c | 11 ++++++----- riscos/wimp.c | 9 +++++---- riscos/wimp_event.c | 7 ++++--- riscos/window.c | 2 +- 18 files changed, 78 insertions(+), 70 deletions(-) (limited to 'riscos') diff --git a/riscos/401login.c b/riscos/401login.c index 76e28adee..16d35c8f7 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -23,14 +23,13 @@ #include #include +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/browser.h" -#include "desktop/gui.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/dialog.h" diff --git a/riscos/download.c b/riscos/download.c index ab730eb36..ff77cda1d 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -18,14 +18,16 @@ * along with this program. If not, see . */ -/** \file - * Download windows (RISC OS implementation). +/** + * \file + * RISC OS download windows implementation. * - * This file implements the interface given by desktop/gui.h for download - * windows. Each download window has an associated fetch. Downloads start by - * writing received data to a temporary file. At some point the user chooses - * a destination (by drag & drop), and the temporary file is then moved to the - * destination and the download continues until complete. + * This file implements the interface given by desktop/gui_download.h + * for download windows. Each download window has an associated + * fetch. Downloads start by writing received data to a temporary + * file. At some point the user chooses a destination (by drag & + * drop), and the temporary file is then moved to the destination and + * the download continues until complete. */ #include @@ -44,8 +46,6 @@ #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "desktop/gui.h" -#include "desktop/download.h" #include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" @@ -53,6 +53,8 @@ #include "utils/utf8.h" #include "utils/utils.h" #include "utils/corestrings.h" +#include "desktop/gui_download.h" +#include "desktop/download.h" #include "riscos/gui.h" #include "riscos/dialog.h" diff --git a/riscos/global_history.c b/riscos/global_history.c index 9d1810503..e81d6b099 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -29,23 +29,25 @@ #include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" + #include "content/urldb.h" +#include "utils/nsoption.h" +#include "utils/messages.h" +#include "utils/log.h" +#include "utils/utils.h" #include "desktop/global_history.h" #include "desktop/tree.h" -#include "desktop/gui.h" +#include "desktop/gui_window.h" + #include "riscos/dialog.h" #include "riscos/global_history.h" #include "riscos/gui.h" #include "riscos/menus.h" -#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/toolbar.h" #include "riscos/treeview.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" -#include "utils/messages.h" -#include "utils/log.h" -#include "utils/utils.h" static void ro_gui_global_history_toolbar_update_buttons(void); static void ro_gui_global_history_toolbar_save_buttons(char *config); diff --git a/riscos/gui.c b/riscos/gui.c index 944696fda..90825b07c 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -47,7 +47,8 @@ #include "utils/filename.h" #include "utils/url.h" #include "utils/corestrings.h" -#include "desktop/gui.h" +#include "desktop/gui_fetch.h" +#include "desktop/gui_misc.h" #include "desktop/save_complete.h" #include "desktop/treeview.h" #include "desktop/netsurf.h" diff --git a/riscos/hotlist.c b/riscos/hotlist.c index 82ad3b0f2..736f368dd 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -31,16 +31,16 @@ #include "oslib/osmodule.h" #include "oslib/wimp.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/nsoption.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/hotlist.h" #include "desktop/tree.h" -#include "desktop/gui.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" -#include "utils/nsoption.h" +#include "desktop/gui_window.h" #include "riscos/gui.h" #include "riscos/dialog.h" diff --git a/riscos/menus.c b/riscos/menus.c index 0b36c2665..3aa26791c 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -19,8 +19,9 @@ * along with this program. If not, see . */ -/** \file - * Menu creation and handling (implementation). +/** + * \file + * Menu creation and handling implementation. */ #include @@ -41,7 +42,6 @@ #include "content/urldb.h" #include "desktop/cookie_manager.h" #include "desktop/browser.h" -#include "desktop/gui.h" #include "desktop/textinput.h" #include "riscos/dialog.h" diff --git a/riscos/save.c b/riscos/save.c index 588b9df32..cd9706635 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -50,7 +50,7 @@ #include "desktop/save_complete.h" #include "desktop/save_text.h" #include "desktop/thumbnail.h" -#include "desktop/gui.h" +#include "desktop/gui_window.h" #include "image/bitmap.h" #include "render/form.h" diff --git a/riscos/search.c b/riscos/search.c index e5e3d987d..ff95430ce 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -17,8 +17,9 @@ * along with this program. If not, see . */ -/** \file - * Free text search (implementation) +/** + * \file + * Free text search implementation */ #include "utils/config.h" @@ -28,15 +29,15 @@ #include "oslib/hourglass.h" #include "oslib/wimp.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "desktop/browser.h" -#include "desktop/gui.h" +#include "desktop/gui_search.h" #include "desktop/browser.h" #include "desktop/search.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #include "riscos/gui.h" #include "riscos/dialog.h" diff --git a/riscos/sslcert.c b/riscos/sslcert.c index a9c79687c..9de49f097 100644 --- a/riscos/sslcert.c +++ b/riscos/sslcert.c @@ -27,18 +27,17 @@ #include #include #include - #include "oslib/wimp.h" + +#include "utils/log.h" +#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "content/fetch.h" #include "content/urldb.h" #include "desktop/browser.h" #include "desktop/sslcert_viewer.h" -#include "desktop/gui.h" #include "desktop/tree.h" -#include "utils/log.h" -#include "utils/utils.h" #include "riscos/dialog.h" #include "riscos/sslcert.h" diff --git a/riscos/textselection.c b/riscos/textselection.c index f002e0773..1222bb490 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -30,7 +30,8 @@ #include "utils/utf8.h" #include "utils/utils.h" #include "content/hlcache.h" -#include "desktop/gui.h" +#include "desktop/gui_clipboard.h" +#include "desktop/gui_window.h" #include "desktop/textinput.h" #include "desktop/browser.h" diff --git a/riscos/theme.c b/riscos/theme.c index a12ed926d..eccf3729f 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -36,26 +36,25 @@ #include "oslib/wimp.h" #include "oslib/wimpextend.h" #include "oslib/wimpspriteop.h" + +#include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/utils.h" #include "content/content.h" -#include "desktop/gui.h" + #include "riscos/cookies.h" #include "riscos/dialog.h" #include "riscos/global_history.h" #include "riscos/gui.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "utils/nsoption.h" #include "riscos/theme.h" #include "riscos/treeview.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/utils.h" - -/* \TODO -- provide a proper interface for these and make them static again! - */ +/** @todo provide a proper interface for these and make them static again! */ static struct theme_descriptor *theme_current = NULL; static struct theme_descriptor *theme_descriptors = NULL; diff --git a/riscos/toolbar.c b/riscos/toolbar.c index 879d97853..757513c88 100644 --- a/riscos/toolbar.c +++ b/riscos/toolbar.c @@ -37,9 +37,13 @@ #include "oslib/wimp.h" #include "oslib/wimpextend.h" #include "oslib/wimpspriteop.h" + +#include "utils/log.h" +#include "utils/utils.h" +#include "utils/nsoption.h" #include "content/content.h" -#include "desktop/gui.h" #include "desktop/plotters.h" + #include "riscos/cookies.h" #include "riscos/dialog.h" #include "riscos/global_history.h" @@ -49,7 +53,6 @@ #include "riscos/gui/url_bar.h" #include "riscos/hotlist.h" #include "riscos/menus.h" -#include "utils/nsoption.h" #include "riscos/save.h" #include "riscos/theme.h" #include "riscos/toolbar.h" @@ -59,8 +62,6 @@ #include "riscos/wimp_event.h" #include "riscos/wimputils.h" #include "riscos/window.h" -#include "utils/log.h" -#include "utils/utils.h" #define TOOLBAR_WIDGET_GUTTER 8 diff --git a/riscos/ucstables.c b/riscos/ucstables.c index f9b6b3648..e8bc25080 100644 --- a/riscos/ucstables.c +++ b/riscos/ucstables.c @@ -31,7 +31,7 @@ #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" -#include "desktop/gui.h" +#include "desktop/gui_utf8.h" #include "riscos/ucstables.h" diff --git a/riscos/uri.c b/riscos/uri.c index bf789ee17..c065a9c62 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -24,17 +24,17 @@ #include #include "oslib/uri.h" #include "oslib/wimp.h" -#include "utils/config.h" + +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/nsurl.h" +#include "utils/utils.h" #include "content/fetch.h" #include "desktop/browser.h" -#include "desktop/gui.h" + #include "riscos/gui.h" #include "riscos/uri.h" #include "riscos/url_protocol.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/nsurl.h" -#include "utils/utils.h" void ro_uri_message_received(wimp_message *msg) { diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index 76d403147..6c5bdac9a 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -31,17 +31,18 @@ #include #include "oslib/inetsuite.h" #include "oslib/wimp.h" + +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/nsurl.h" +#include "utils/utils.h" #include "utils/config.h" #include "content/fetch.h" #include "desktop/browser.h" -#include "desktop/gui.h" + #include "riscos/gui.h" #include "riscos/uri.h" #include "riscos/url_protocol.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/nsurl.h" -#include "utils/utils.h" /** * Handle a Message_InetSuiteOpenURL. diff --git a/riscos/wimp.c b/riscos/wimp.c index f59fa675a..156dbe692 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -33,13 +33,14 @@ #include "oslib/wimp.h" #include "oslib/wimpextend.h" #include "oslib/wimpspriteop.h" -#include "desktop/gui.h" -#include "riscos/gui.h" -#include "riscos/oslib_pre7.h" -#include "riscos/wimp.h" + #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" + +#include "riscos/gui.h" +#include "riscos/oslib_pre7.h" +#include "riscos/wimp.h" #include "riscos/ucstables.h" diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c index d42d2b08a..40d704929 100644 --- a/riscos/wimp_event.c +++ b/riscos/wimp_event.c @@ -31,7 +31,10 @@ #include "oslib/osbyte.h" #include "oslib/serviceinternational.h" #include "oslib/wimp.h" -#include "desktop/gui.h" + +#include "utils/log.h" +#include "utils/utils.h" + #include "riscos/gui.h" #include "riscos/dialog.h" #include "riscos/menus.h" @@ -39,8 +42,6 @@ #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/wimputils.h" -#include "utils/log.h" -#include "utils/utils.h" #define WIN_HASH_SIZE 32 #define WIN_HASH(w) (((unsigned)(w) >> 5) % WIN_HASH_SIZE) diff --git a/riscos/window.c b/riscos/window.c index 39217560f..bf262864d 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -64,7 +64,7 @@ #include "desktop/textinput.h" #include "desktop/thumbnail.h" #include "desktop/tree.h" -#include "desktop/gui.h" +#include "desktop/gui_window.h" #include "render/form.h" #include "render/html.h" -- cgit v1.2.3