summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2010-02-16 12:45:38 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2010-02-16 12:45:38 +0000
commit3a4544a65158a953638554c7212dbb530be96cbf (patch)
treeac0b3d8b3ea4004615feb9c4d6a1d3e0b8afccb4 /src/emu/ui.c
parent6fcc0f634ba242e57d930183e6dc2ef9f0cb116a (diff)
ui.c,ui.h,windows/input.c: [Miodrag Milanovic]
- removed ui_use_new_ui check used by MESS code - moved ui_mess_handler_ingame call in proper place, so device UI callbacks works again - removed toggle of menu bar (MESS related)
Diffstat (limited to 'src/emu/ui.c')
-rw-r--r--src/emu/ui.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/src/emu/ui.c b/src/emu/ui.c
index f34daaf8c6f..6820295d849 100644
--- a/src/emu/ui.c
+++ b/src/emu/ui.c
@@ -1179,22 +1179,6 @@ static UINT32 handler_messagebox_anykey(running_machine *machine, render_contain
/*-------------------------------------------------
- ui_use_new_ui - determines if the "new ui"
- is in use
--------------------------------------------------*/
-
-int ui_use_new_ui(void)
-{
-#ifdef MESS
-#if (defined(WIN32) || defined(_MSC_VER)) && !defined(SDLMAME_WIN32)
- if (options_get_bool(mame_options(), "newui"))
- return TRUE;
-#endif
-#endif
- return FALSE;
-}
-
-/*-------------------------------------------------
process_natural_keyboard - processes any
natural keyboard input
-------------------------------------------------*/
@@ -1300,10 +1284,10 @@ static UINT32 handler_ingame(running_machine *machine, render_container *contain
}
/* determine if we should disable the rest of the UI */
- int ui_disabled = ui_use_new_ui() || (input_machine_has_keyboard(machine) && !ui_active);
+ int ui_disabled = (input_machine_has_keyboard(machine) && !ui_active);
/* is ScrLk UI toggling applicable here? */
- if (!ui_use_new_ui() && input_machine_has_keyboard(machine))
+ if (input_machine_has_keyboard(machine))
{
/* are we toggling the UI with ScrLk? */
if (ui_input_pressed(machine, IPT_UI_TOGGLE_UI))
@@ -1339,7 +1323,6 @@ static UINT32 handler_ingame(running_machine *machine, render_container *contain
if (ui_get_use_natural_keyboard(machine) && (mame_get_phase(machine) == MAME_PHASE_RUNNING))
process_natural_keyboard(machine);
- /* MESS-specific UI; provided that the UI is not disabled */
if (!ui_disabled)
{
/* paste command */
@@ -1347,12 +1330,12 @@ static UINT32 handler_ingame(running_machine *machine, render_container *contain
ui_paste(machine);
}
- if (ui_disabled) return ui_disabled;
-
#ifdef MESS
ui_mess_handler_ingame(machine);
#endif /* MESS */
+ if (ui_disabled) return ui_disabled;
+
/* if the user pressed ESC, stop the emulation */
if (ui_input_pressed(machine, IPT_UI_CANCEL))
mame_schedule_exit(machine);