Try moving form_control into gui_window

This commit is contained in:
Chris Young 2019-05-08 00:18:43 +01:00
parent 4713e1c8af
commit c64d48005c
2 changed files with 3 additions and 5 deletions

View File

@ -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;
}

View File

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