diff options
author | 2016-03-02 21:49:49 +0100 | |
---|---|---|
committer | 2016-03-02 21:49:49 +0100 | |
commit | 9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch) | |
tree | 3911b611dd010a4108b90fb8b8c82116eec21117 /src/emu/uiinput.cpp | |
parent | dbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff) | |
parent | 1914702e6fae052668df5b068a502bca57c9a3b0 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts:
# src/osd/modules/render/d3d/d3dhlsl.cpp
# src/osd/windows/winmain.cpp
Diffstat (limited to 'src/emu/uiinput.cpp')
-rw-r--r-- | src/emu/uiinput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/uiinput.cpp b/src/emu/uiinput.cpp index c55038d3065..1b65388bc14 100644 --- a/src/emu/uiinput.cpp +++ b/src/emu/uiinput.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nicola Salmoria /*************************************************************************** - uiinput.c + uiinput.cpp Internal MAME user interface input state. ***************************************************************************/ @@ -326,8 +326,8 @@ void ui_input_manager::push_char_event(render_target* target, unicode_char ch) } /*------------------------------------------------- - push_mouse_wheel_event - pushes a mouse - wheel event to the specified render_target + push_mouse_wheel_event - pushes a mouse + wheel event to the specified render_target -------------------------------------------------*/ void ui_input_manager::push_mouse_wheel_event(render_target *target, INT32 x, INT32 y, short delta, int ucNumLines) @@ -350,4 +350,4 @@ void ui_input_manager::mark_all_as_pressed() { for (int code = IPT_UI_FIRST + 1; code < IPT_UI_LAST; code++) m_next_repeat[code] = osd_ticks(); -}
\ No newline at end of file +} |