diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-05-08 00:18:43 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-05-08 00:18:43 +0100 |
commit | c64d48005c31a7046f224b796a3da5ac0e79751d (patch) | |
tree | 5b43dcdd60ab0cda6b7ca00847a5a086c7f5dcd1 /frontends/amiga | |
parent | 4713e1c8af2e4defbc127150838bd35549038b7b (diff) | |
download | netsurf-c64d48005c31a7046f224b796a3da5ac0e79751d.tar.gz netsurf-c64d48005c31a7046f224b796a3da5ac0e79751d.tar.bz2 |
Try moving form_control into gui_window
Diffstat (limited to 'frontends/amiga')
-rw-r--r-- | frontends/amiga/gui.c | 7 | ||||
-rw-r--r-- | frontends/amiga/gui.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 0d7299ffd..a2cee1036 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -214,6 +214,7 @@ struct gui_window struct MinList *deferred_rects; struct browser_window *bw; float scale; + struct form_control *control; }; struct ami_gui_tb_userdata { @@ -391,9 +392,8 @@ void ami_gui2_set_menu(struct gui_window_2 *gwin, struct Menu *menu) struct form_control *ami_gui_get_control(struct gui_window *gw) { - /* TODO: does this need to be in the shared window? */ assert(gw != NULL); - return gw->shared->control; + return gw->control; } /** @@ -401,9 +401,8 @@ struct form_control *ami_gui_get_control(struct gui_window *gw) */ void ami_gui_set_control(struct gui_window *gw, struct form_control *control) { - /* TODO: does this need to be in the shared window? */ assert(gw != NULL); - gw->shared->control = control; + gw->control = control; } diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h index d5967de8e..50a340e7f 100644 --- a/frontends/amiga/gui.h +++ b/frontends/amiga/gui.h @@ -114,7 +114,6 @@ struct gui_window_2 { ULONG next_tab; struct Node *last_new_tab; struct Hook scrollerhook; - struct form_control *control; browser_mouse_state mouse_state; browser_mouse_state key_state; ULONG throbber_update_count; |