diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-26 00:05:01 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-26 00:05:01 +0000 |
| commit | 3a5907c1c40bae0ec70acda808eeaa4044bd0943 (patch) | |
| tree | ce3a4c75f6c4775313df69801f73235cc8614ec2 /amiga/menu.c | |
| parent | c8c806a0c2b5dfaa2cf498631c6044baf43493f9 (diff) | |
| download | netsurf-3a5907c1c40bae0ec70acda808eeaa4044bd0943.tar.gz netsurf-3a5907c1c40bae0ec70acda808eeaa4044bd0943.tar.bz2 | |
Move everything else over to using the class pointers.
Exception: popupmenu.class is still using old _GetClass functions.
Diffstat (limited to 'amiga/menu.c')
| -rw-r--r-- | amiga/menu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index 111b16540..efc769938 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -61,6 +61,7 @@ #include "amiga/history.h" #include "amiga/history_local.h" #include "amiga/hotlist.h" +#include "amiga/libs.h" #include "amiga/menu.h" #include "amiga/misc.h" #include "amiga/print.h" @@ -429,7 +430,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) int icon_width = 0; Object *blank_space = NULL; Object *submenuarrow = NULL; - Object *icon = BitMapObject, + Object *icon = BitMapObj, BITMAP_Screen, scrn, BITMAP_SourceFile, gwin->menuicon[i], BITMAP_Masking, TRUE, @@ -487,7 +488,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) TAG_DONE); } - gwin->menuobj[i] = LabelObject, + gwin->menuobj[i] = LabelObj, LABEL_MenuMode, TRUE, LABEL_DrawInfo, dri, LABEL_DisposeImage, TRUE, |