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/login.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/login.c')
-rwxr-xr-x | amiga/login.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/amiga/login.c b/amiga/login.c index 611ba2adf..655a4b13b 100755 --- a/amiga/login.c +++ b/amiga/login.c @@ -43,6 +43,7 @@ #include "desktop/gui_window.h" #include "amiga/gui.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/object.h" #include "amiga/login.h" @@ -95,7 +96,7 @@ void gui_401login_open(nsurl *url, const char *realm, lw->pwd[pwd_len] = '\0'; } - lw->objects[OID_MAIN] = WindowObject, + lw->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, nsurl_access(lw->url), WA_Activate, TRUE, @@ -109,52 +110,52 @@ void gui_401login_open(nsurl *url, const char *realm, WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, lw->objects[GID_MAIN] = VGroupObject, - LAYOUT_AddChild, StringObject, + WINDOW_ParentGroup, lw->objects[GID_MAIN] = LayoutVObj, + LAYOUT_AddChild, StringObj, STRINGA_TextVal, lwc_string_data(lw->host), GA_ReadOnly,TRUE, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text,messages_get("Host"), LabelEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, StringObject, + LAYOUT_AddChild, StringObj, STRINGA_TextVal,lw->realm, GA_ReadOnly,TRUE, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text,messages_get("Realm"), LabelEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, lw->objects[GID_USER] = StringObject, + LAYOUT_AddChild, lw->objects[GID_USER] = StringObj, GA_ID,GID_USER, GA_TabCycle,TRUE, STRINGA_TextVal, lw->uname, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text,messages_get("Username"), LabelEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, lw->objects[GID_PASS] = StringObject, + LAYOUT_AddChild, lw->objects[GID_PASS] = StringObj, GA_ID,GID_PASS, STRINGA_HookType,SHK_PASSWORD, GA_TabCycle,TRUE, STRINGA_TextVal, lw->pwd, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text,messages_get("Password"), LabelEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, lw->objects[GID_LOGIN] = ButtonObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, lw->objects[GID_LOGIN] = ButtonObj, GA_ID,GID_LOGIN, GA_RelVerify,TRUE, GA_Text,messages_get("Login"), GA_TabCycle,TRUE, ButtonEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, lw->objects[GID_CANCEL] = ButtonObject, + LAYOUT_AddChild, lw->objects[GID_CANCEL] = ButtonObj, GA_ID,GID_CANCEL, GA_RelVerify,TRUE, GA_Text,messages_get("Cancel"), |