summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/menu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/ui/menu.cpp')
-rw-r--r--src/emu/ui/menu.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp
index e32e77ab930..069b05aa913 100644
--- a/src/emu/ui/menu.cpp
+++ b/src/emu/ui/menu.cpp
@@ -58,7 +58,7 @@ inline bool ui_menu_item::is_selectable() const
inline bool ui_menu::exclusive_input_pressed(int key, int repeat)
{
- if (menu_event.iptkey == IPT_INVALID && ui_input_pressed_repeat(machine(), key, repeat))
+ if (menu_event.iptkey == IPT_INVALID && machine().ui_input().pressed_repeat(key, repeat))
{
menu_event.iptkey = key;
return true;
@@ -492,7 +492,7 @@ void ui_menu::draw(bool customonly)
mouse_button = false;
if (!customonly)
{
- mouse_target = ui_input_find_mouse(machine(), &mouse_target_x, &mouse_target_y, &mouse_button);
+ mouse_target = machine().ui_input().find_mouse(&mouse_target_x, &mouse_target_y, &mouse_button);
if (mouse_target != nullptr)
if (mouse_target->map_point_container(mouse_target_x, mouse_target_y, *container, mouse_x, mouse_y))
mouse_hit = true;
@@ -749,7 +749,7 @@ void ui_menu::handle_events()
ui_event local_menu_event;
// loop while we have interesting events
- while (!stop && ui_input_pop_event(machine(), &local_menu_event))
+ while (!stop && machine().ui_input().pop_event(&local_menu_event))
{
switch (local_menu_event.event_type)
{
@@ -901,7 +901,7 @@ void ui_menu::handle_keys(UINT32 flags)
}
// handle a toggle cheats request
- if (ui_input_pressed_repeat(machine(), IPT_UI_TOGGLE_CHEAT, 0))
+ if (machine().ui_input().pressed_repeat(IPT_UI_TOGGLE_CHEAT, 0))
machine().cheat().set_enable(!machine().cheat().enabled());
// see if any other UI keys are pressed
@@ -979,7 +979,7 @@ void ui_menu::stack_push(ui_menu *menu)
menu->parent = menu_stack;
menu_stack = menu;
menu->reset(UI_MENU_RESET_SELECT_FIRST);
- ui_input_reset(menu->machine());
+ menu->machine().ui_input().reset();
}
@@ -995,7 +995,7 @@ void ui_menu::stack_pop(running_machine &machine)
menu_stack = menu->parent;
menu->parent = menu_free;
menu_free = menu;
- ui_input_reset(machine);
+ machine.ui_input().reset();
}
}
@@ -1047,7 +1047,7 @@ UINT32 ui_menu::ui_handler(running_machine &machine, render_container *container
clear_free_list(machine);
// if the menus are to be hidden, return a cancel here
- if (machine.ui().is_menu_active() && ((ui_input_pressed(machine, IPT_UI_CONFIGURE) && !stack_has_special_main_menu()) || menu_stack == nullptr))
+ if (machine.ui().is_menu_active() && ((machine.ui_input().pressed(IPT_UI_CONFIGURE) && !stack_has_special_main_menu()) || menu_stack == nullptr))
return UI_HANDLER_CANCEL;
return 0;