summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend/mame/ui/filecreate.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontend/mame/ui/filecreate.cpp')
-rw-r--r--src/frontend/mame/ui/filecreate.cpp41
1 files changed, 16 insertions, 25 deletions
diff --git a/src/frontend/mame/ui/filecreate.cpp b/src/frontend/mame/ui/filecreate.cpp
index 1474c562829..875fe1cd197 100644
--- a/src/frontend/mame/ui/filecreate.cpp
+++ b/src/frontend/mame/ui/filecreate.cpp
@@ -12,19 +12,18 @@
***************************************************************************/
#include "emu.h"
-
#include "ui/filecreate.h"
+
#include "ui/ui.h"
#include "ui/utils.h"
-#include "imagedev/floppy.h"
-
#include "zippath.h"
#include <cstring>
namespace ui {
+
/***************************************************************************
CONSTANTS
***************************************************************************/
@@ -86,15 +85,12 @@ void menu_confirm_save_as::populate(float &customtop, float &custombottom)
// handle - confirm save as menu
//-------------------------------------------------
-void menu_confirm_save_as::handle()
+void menu_confirm_save_as::handle(event const *ev)
{
- // process the menu
- const event *event = process(0);
-
// process the event
- if ((event != nullptr) && (event->iptkey == IPT_UI_SELECT))
+ if (ev && (ev->iptkey == IPT_UI_SELECT))
{
- if (event->itemref == ITEMREF_YES)
+ if (ev->itemref == ITEMREF_YES)
*m_yes = true;
// no matter what, pop out
@@ -190,19 +186,16 @@ void menu_file_create::populate(float &customtop, float &custombottom)
// handle - file creator menu
//-------------------------------------------------
-void menu_file_create::handle()
+void menu_file_create::handle(event const *ev)
{
- // process the menu
- const event *event = process(0);
-
// process the event
- if (event)
+ if (ev)
{
// handle selections
- switch (event->iptkey)
+ switch (ev->iptkey)
{
case IPT_UI_SELECT:
- if ((event->itemref == ITEMREF_CREATE) || (event->itemref == ITEMREF_NEW_IMAGE_NAME))
+ if ((ev->itemref == ITEMREF_CREATE) || (ev->itemref == ITEMREF_NEW_IMAGE_NAME))
{
std::string tmp_file(m_filename);
if (tmp_file.find('.') != -1 && tmp_file.find('.') < tmp_file.length() - 1)
@@ -218,7 +211,7 @@ void menu_file_create::handle()
case IPT_SPECIAL:
if (get_selection_ref() == ITEMREF_NEW_IMAGE_NAME)
{
- input_character(m_filename, event->unichar, &osd_is_valid_filename_char);
+ input_character(m_filename, ev->unichar, &osd_is_valid_filename_char);
reset(reset_options::REMEMBER_POSITION);
}
break;
@@ -278,13 +271,12 @@ void menu_select_format::populate(float &customtop, float &custombottom)
// handle
//-------------------------------------------------
-void menu_select_format::handle()
+void menu_select_format::handle(event const *ev)
{
// process the menu
- const event *event = process(0);
- if (event != nullptr && event->iptkey == IPT_UI_SELECT)
+ if (ev && ev->iptkey == IPT_UI_SELECT)
{
- *m_result = (floppy_image_format_t *)event->itemref;
+ *m_result = (floppy_image_format_t *)ev->itemref;
stack_pop();
}
}
@@ -333,13 +325,12 @@ void menu_select_floppy_init::populate(float &customtop, float &custombottom)
// handle
//-------------------------------------------------
-void menu_select_floppy_init::handle()
+void menu_select_floppy_init::handle(event const *ev)
{
// process the menu
- const event *event = process(0);
- if (event != nullptr && event->iptkey == IPT_UI_SELECT)
+ if (ev && ev->iptkey == IPT_UI_SELECT)
{
- *m_result = int(uintptr_t(event->itemref));
+ *m_result = int(uintptr_t(ev->itemref));
stack_pop();
}
}