diff options
Diffstat (limited to 'src/osd/sdl/input.cpp')
-rw-r--r-- | src/osd/sdl/input.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/osd/sdl/input.cpp b/src/osd/sdl/input.cpp index e2732c0a61c..4dfb5bd0ad0 100644 --- a/src/osd/sdl/input.cpp +++ b/src/osd/sdl/input.cpp @@ -1741,7 +1741,7 @@ void sdlinput_poll(running_machine &machine) devinfo->keyboard.state[OSD_SDL_INDEX_KEYSYM(&event.key.keysym)] = 0x80; #if (SDLMAME_SDL2) if (event.key.keysym.sym < 0x20) - ui_input_push_char_event(machine, sdl_window_list->target(), event.key.keysym.sym); + machine.ui_input().push_char_event(sdl_window_list->target(), event.key.keysym.sym); #else ui_input_push_char_event(machine, sdl_window_list->target(), (unicode_char) event.key.keysym.unicode); #endif @@ -1845,14 +1845,14 @@ void sdlinput_poll(running_machine &machine) sdl_window_info *window = GET_FOCUS_WINDOW(&event.button); if (window != NULL && window->xy_to_render_target(event.button.x,event.button.y, &cx, &cy) ) { - ui_input_push_mouse_down_event(machine, window->target(), cx, cy); + machine.ui_input().push_mouse_down_event(window->target(), cx, cy); // FIXME Parameter ? if ((click-last_click < 250) && (cx >= last_x - 4 && cx <= last_x + 4) && (cy >= last_y - 4 && cy <= last_y + 4) ) { last_click = 0; - ui_input_push_mouse_double_click_event(machine, window->target(), cx, cy); + machine.ui_input().push_mouse_double_click_event(window->target(), cx, cy); } else { @@ -1879,7 +1879,7 @@ void sdlinput_poll(running_machine &machine) if (window != NULL && window->xy_to_render_target(event.button.x,event.button.y, &cx, &cy) ) { - ui_input_push_mouse_up_event(machine, window->target(), cx, cy); + machine.ui_input().push_mouse_up_event(window->target(), cx, cy); } } break; @@ -1903,7 +1903,7 @@ void sdlinput_poll(running_machine &machine) sdl_window_info *window = GET_FOCUS_WINDOW(&event.motion); if (window != NULL && window->xy_to_render_target(event.motion.x, event.motion.y, &cx, &cy) ) - ui_input_push_mouse_move_event(machine, window->target(), cx, cy); + machine.ui_input().push_mouse_move_event(window->target(), cx, cy); } break; case SDL_JOYBALLMOTION: @@ -1937,7 +1937,7 @@ void sdlinput_poll(running_machine &machine) if (window != NULL ) { osd_uchar_from_osdchar(&result, event.text.text, 1); - ui_input_push_char_event(machine, window->target(), result); + machine.ui_input().push_char_event(window->target(), result); } } break; @@ -1954,7 +1954,7 @@ void sdlinput_poll(running_machine &machine) machine.schedule_exit(); break; case SDL_WINDOWEVENT_LEAVE: - ui_input_push_mouse_leave_event(machine, window->target()); + machine.ui_input().push_mouse_leave_event(window->target()); app_has_mouse_focus = 0; break; case SDL_WINDOWEVENT_MOVED: @@ -2219,7 +2219,7 @@ static device_info *generic_device_alloc(device_info **devlist_head_ptr, const c device_info *devinfo; // allocate memory for the device object - devinfo = global_alloc_clear(device_info); + devinfo = global_alloc_clear<device_info>(); devinfo->head = devlist_head_ptr; // allocate a UTF8 copy of the name |