From 5c7b5476f0739e5f62071800830b7600a64a3dd5 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 7 May 2019 21:45:40 +0100 Subject: Make gui_window private to gui.c TODO: ratonalise these accessors --- frontends/amiga/selectmenu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'frontends/amiga/selectmenu.c') diff --git a/frontends/amiga/selectmenu.c b/frontends/amiga/selectmenu.c index 8a8614136..63763a420 100644 --- a/frontends/amiga/selectmenu.c +++ b/frontends/amiga/selectmenu.c @@ -74,7 +74,7 @@ HOOKF(uint32, ami_popup_hook, Object *, item, APTR) struct gui_window *gwin = hook->h_Data; if(GetAttr(PMIA_ID, item, &itemid)) { - form_select_process_selection(gwin->shared->control, itemid); + form_select_process_selection(ami_gui_get_gui_window_2(gwin)->control, itemid); } return itemid; @@ -111,7 +111,7 @@ void gui_create_form_select_menu(struct gui_window *g, selectmenuhook.h_SubEntry = NULL; selectmenuhook.h_Data = g; - g->shared->control = control; + ami_gui_get_gui_window_2(g)->control = control; selectmenuobj = PMMENU(form_control_get_name(control)), PMA_MenuHandler, &selectmenuhook, End; @@ -166,9 +166,9 @@ void gui_create_form_select_menu(struct gui_window *g, ~0); } - ami_set_pointer(g->shared, GUI_POINTER_DEFAULT, false); // Clear the menu-style pointer + ami_set_pointer(ami_gui_get_gui_window_2(g), GUI_POINTER_DEFAULT, false); // Clear the menu-style pointer - IDoMethod(selectmenuobj, PM_OPEN, g->shared->win); + IDoMethod(selectmenuobj, PM_OPEN, ami_gui_get_gui_window_2(g)->win); /* PM_OPEN is blocking, so dispose menu immediately... */ if(selectmenuobj) DisposeObject(selectmenuobj); -- cgit v1.2.3