mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Chris Young 2010-04-04 11:15:05 +00:00
parent 43a99ab683
commit 3daffe3d6b
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
amiga/download.c
View File

@ -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,

3
amiga/download.h
View File

@ -28,8 +28,7 @@ struct dlnode
struct gui_download_window {
struct Window *win;
Object *objects[OID_LAST];
struct Gadget *gadgets[GID_LAST];
Object *objects[GID_LAST];
struct nsObject *node;
ULONG pad[5];
BPTR fh;

14
amiga/login.c
View File

@ -65,7 +65,7 @@ void gui_401login_open(struct browser_window *bw, hlcache_handle *c,
WINDOW_IconifyGadget, FALSE,
WINDOW_LockHeight,TRUE,
WINDOW_Position, WPOS_CENTERSCREEN,
WINDOW_ParentGroup, lw->gadgets[GID_MAIN] = VGroupObject,
WINDOW_ParentGroup, lw->objects[GID_MAIN] = VGroupObject,
LAYOUT_AddChild, StringObject,
STRINGA_TextVal,lw->host,
GA_ReadOnly,TRUE,
@ -82,7 +82,7 @@ void gui_401login_open(struct browser_window *bw, hlcache_handle *c,
LABEL_Text,messages_get("Realm"),
LabelEnd,
CHILD_WeightedHeight,0,
LAYOUT_AddChild, lw->gadgets[GID_USER] = StringObject,
LAYOUT_AddChild, lw->objects[GID_USER] = StringObject,
GA_ID,GID_USER,
GA_TabCycle,TRUE,
StringEnd,
@ -90,7 +90,7 @@ void gui_401login_open(struct browser_window *bw, hlcache_handle *c,
LABEL_Text,messages_get("Username"),
LabelEnd,
CHILD_WeightedHeight,0,
LAYOUT_AddChild, lw->gadgets[GID_PASS] = StringObject,
LAYOUT_AddChild, lw->objects[GID_PASS] = StringObject,
GA_ID,GID_PASS,
STRINGA_HookType,SHK_PASSWORD,
GA_TabCycle,TRUE,
@ -100,14 +100,14 @@ void gui_401login_open(struct browser_window *bw, hlcache_handle *c,
LabelEnd,
CHILD_WeightedHeight,0,
LAYOUT_AddChild, HGroupObject,
LAYOUT_AddChild, lw->gadgets[GID_LOGIN] = ButtonObject,
LAYOUT_AddChild, lw->objects[GID_LOGIN] = ButtonObject,
GA_ID,GID_LOGIN,
GA_RelVerify,TRUE,
GA_Text,messages_get("Login"),
GA_TabCycle,TRUE,
ButtonEnd,
CHILD_WeightedHeight,0,
LAYOUT_AddChild, lw->gadgets[GID_CANCEL] = ButtonObject,
LAYOUT_AddChild, lw->objects[GID_CANCEL] = ButtonObject,
GA_ID,GID_CANCEL,
GA_RelVerify,TRUE,
GA_Text,messages_get("Cancel"),
@ -136,8 +136,8 @@ void ami_401login_login(struct gui_login_window *lw)
ULONG *user,*pass;
STRPTR userpass;
GetAttr(STRINGA_TextVal,lw->gadgets[GID_USER],(ULONG *)&user);
GetAttr(STRINGA_TextVal,lw->gadgets[GID_PASS],(ULONG *)&pass);
GetAttr(STRINGA_TextVal,lw->objects[GID_USER],(ULONG *)&user);
GetAttr(STRINGA_TextVal,lw->objects[GID_PASS],(ULONG *)&pass);
userpass = ASPrintf("%s:%s",user,pass);
urldb_set_auth_details(lw->url,lw->realm,userpass);

3
amiga/login.h
View File

@ -20,8 +20,7 @@
#define AMIGA_LOGIN_H
struct gui_login_window {
struct Window *win;
Object *objects[OID_LAST];
struct Gadget *gadgets[GID_LAST];
Object *objects[GID_LAST];
struct nsObject *node;
struct browser_window *bw;
ULONG pad[3];