From 3daffe3d6b07be7bbeedbcb2586f11edd872cbd6 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 4 Apr 2010 11:15:05 +0000 Subject: Events for these windows are handled by the main loop in gui.c, but the structures didn't match up, thereby causing a crash. Needs tidying up; the global part of these window structures should be defined separately, and the events handled in dedicated routines. svn path=/trunk/netsurf/; revision=10235 --- amiga/download.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'amiga/download.c') diff --git a/amiga/download.c b/amiga/download.c index 3d5a26fff..4f11f1b5f 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -114,8 +114,8 @@ struct gui_download_window *gui_download_window_create(const char *url, WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, dw->gadgets[GID_MAIN] = VGroupObject, - LAYOUT_AddChild, dw->gadgets[GID_STATUS] = FuelGaugeObject, + WINDOW_ParentGroup, dw->objects[GID_MAIN] = VGroupObject, + LAYOUT_AddChild, dw->objects[GID_STATUS] = FuelGaugeObject, GA_ID,GID_STATUS, GA_Text,messages_get("amiDownload"), FUELGAUGE_Min,0, @@ -129,7 +129,7 @@ struct gui_download_window *gui_download_window_create(const char *url, FuelGaugeEnd, CHILD_NominalSize,TRUE, CHILD_WeightedHeight,0, - LAYOUT_AddChild, dw->gadgets[GID_CANCEL] = ButtonObject, + LAYOUT_AddChild, dw->objects[GID_CANCEL] = ButtonObject, GA_ID,GID_CANCEL, GA_RelVerify,TRUE, GA_Text,messages_get("Abort"), @@ -162,7 +162,7 @@ void gui_download_window_data(struct gui_download_window *dw, const char *data, if(dw->size) { - RefreshSetGadgetAttrs(dw->gadgets[GID_STATUS],dw->win,NULL, + RefreshSetGadgetAttrs(dw->objects[GID_STATUS],dw->win,NULL, FUELGAUGE_Level,dw->downloaded, GA_Text,messages_get("amiDownload"), FUELGAUGE_VarArgs,va, @@ -170,7 +170,7 @@ void gui_download_window_data(struct gui_download_window *dw, const char *data, } else { - RefreshSetGadgetAttrs(dw->gadgets[GID_STATUS],dw->win,NULL, + RefreshSetGadgetAttrs(dw->objects[GID_STATUS],dw->win,NULL, FUELGAUGE_Level,dw->downloaded, GA_Text,messages_get("amiDownloadU"), FUELGAUGE_VarArgs,va, -- cgit v1.2.3