From 73827546ef08d1b2357ae7640a3e8c6fd34c63ab Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 13 Feb 2010 18:03:05 +0000 Subject: Fix new warnings. Not sure if I should be declaring all the gadgets as Object *, but that is less casting than declaring them all as struct Gadget * - and allows the merging of object and gadget arrays, which were causing a few problems previously. svn path=/trunk/netsurf/; revision=10039 --- amiga/gui.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'amiga/gui.h') diff --git a/amiga/gui.h b/amiga/gui.h index b1f512e08..466b3c4f0 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -28,7 +28,12 @@ enum { - GID_MAIN=0, + OID_MAIN = 0, + OID_VSCROLL, + OID_HSCROLL, + OID_MENU, + OID_LAST, /* for compatibility */ + GID_MAIN, GID_TABLAYOUT, GID_BROWSER, GID_STATUS, @@ -62,16 +67,7 @@ enum GID_CASE, GID_TOOLBARLAYOUT, GID_HSCROLL, - GID_LAST -}; - -enum -{ - OID_MAIN=0, - OID_VSCROLL, - OID_HSCROLL, - OID_MENU, - OID_LAST + GID_LAST }; #define AMI_GUI_POINTER_BLANK GUI_POINTER_PROGRESS+1 @@ -84,7 +80,6 @@ struct history_window; struct gui_window_2 { struct Window *win; Object *objects[OID_LAST]; - struct Gadget *gadgets[GID_LAST]; struct nsObject *node; struct browser_window *bw; bool redraw_required; -- cgit v1.2.3