diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2004-06-30 22:09:20 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2004-06-30 22:09:20 +0000 |
| commit | 8facc29e586677acd7b8388e9b454059aef6082d (patch) | |
| tree | 05370275df39b1eae5c714cb8c43b579ad8adbbd | |
| parent | 0401fcdc55f61f13b050906e56ea63685f76cb88 (diff) | |
| download | netsurf-8facc29e586677acd7b8388e9b454059aef6082d.tar.gz netsurf-8facc29e586677acd7b8388e9b454059aef6082d.tar.bz2 | |
[project @ 2004-06-30 22:09:20 by jmb]
Fixes for Norcroft
svn path=/import/netsurf/; revision=1034
| -rw-r--r-- | riscos/htmlredraw.c | 2 | ||||
| -rw-r--r-- | riscos/menus.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/riscos/htmlredraw.c b/riscos/htmlredraw.c index 198fde7cd..f9afd814e 100644 --- a/riscos/htmlredraw.c +++ b/riscos/htmlredraw.c @@ -9,12 +9,12 @@ #include <assert.h> #include <stdbool.h> #include <string.h> +#include "swis.h" #include "oslib/colourtrans.h" #include "oslib/draw.h" #include "oslib/font.h" #include "oslib/os.h" #include "oslib/wimp.h" -#include "swis.h" #include "netsurf/utils/config.h" #include "netsurf/css/css.h" #include "netsurf/content/content.h" diff --git a/riscos/menus.c b/riscos/menus.c index 7cf598fc8..9e5174ae2 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -63,7 +63,7 @@ struct content *save_content = 0; /* Iconbar menu */ -wimp_menu *iconbar_menu = (wimp_menu *)&(wimp_MENU(4)) { +static wimp_MENU(4) ibar_menu = { { "NetSurf" }, 7,2,7,0, 200, 44, 0, { { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "Info" } }, @@ -73,6 +73,7 @@ wimp_menu *iconbar_menu = (wimp_menu *)&(wimp_MENU(4)) { } }; int iconbar_menu_height = 4 * 44; +wimp_menu *iconbar_menu = (wimp_menu *)&ibar_menu; /* Export submenu |