summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/uiinput.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/emu/uiinput.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/emu/uiinput.cpp')
-rw-r--r--src/emu/uiinput.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/uiinput.cpp b/src/emu/uiinput.cpp
index b0cbaa0add0..8ec5c8b91cc 100644
--- a/src/emu/uiinput.cpp
+++ b/src/emu/uiinput.cpp
@@ -116,7 +116,7 @@ bool ui_input_push_event(running_machine &machine, ui_event evt)
ui_input_private *uidata = machine.ui_input_data;
/* we may be called before the UI is initialized */
- if (uidata == NULL)
+ if (uidata == nullptr)
return false;
/* some pre-processing (this is an icky place to do this stuff!) */
@@ -131,7 +131,7 @@ bool ui_input_push_event(running_machine &machine, ui_event evt)
case UI_EVENT_MOUSE_LEAVE:
if (uidata->current_mouse_target == evt.target)
{
- uidata->current_mouse_target = NULL;
+ uidata->current_mouse_target = nullptr;
uidata->current_mouse_x = -1;
uidata->current_mouse_y = -1;
}
@@ -212,11 +212,11 @@ void ui_input_reset(running_machine &machine)
render_target *ui_input_find_mouse(running_machine &machine, INT32 *x, INT32 *y, bool *button)
{
ui_input_private *uidata = machine.ui_input_data;
- if (x != NULL)
+ if (x != nullptr)
*x = uidata->current_mouse_x;
- if (y != NULL)
+ if (y != nullptr)
*y = uidata->current_mouse_y;
- if (button != NULL)
+ if (button != nullptr)
*button = uidata->current_mouse_down;
return uidata->current_mouse_target;
}