summaryrefslogtreecommitdiff
path: root/amiga/gui.h
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2010-02-13 18:03:05 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2010-02-13 18:03:05 +0000
commit73827546ef08d1b2357ae7640a3e8c6fd34c63ab (patch)
tree30719762582122c2f44c71718ae4f41812881879 /amiga/gui.h
parent44f93cb28816aec0b77329acb610ef668ff336db (diff)
downloadnetsurf-73827546ef08d1b2357ae7640a3e8c6fd34c63ab.tar.gz
netsurf-73827546ef08d1b2357ae7640a3e8c6fd34c63ab.tar.bz2
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
Diffstat (limited to 'amiga/gui.h')
-rwxr-xr-xamiga/gui.h19
1 files changed, 7 insertions, 12 deletions
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;