summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-05-16 19:58:59 +0200
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-05-16 19:59:15 +0200
commitb06be31dfe70c4d13f88b304e7e8dab515bd0919 (patch)
tree2bbce2c5b5902b647e33853aa087c59f0d5be2fb /src/emu
parent0069d44ff7f06dca7d3b233305c8e13185867615 (diff)
Move slider_state and ui_menu_item into src/frontend/mame, nw
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/machine.cpp1
-rw-r--r--src/emu/ui/uimain.h47
2 files changed, 1 insertions, 47 deletions
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index 80867963a0b..6b18f910425 100644
--- a/src/emu/machine.cpp
+++ b/src/emu/machine.cpp
@@ -80,6 +80,7 @@
#include "debug/debugvw.h"
#include "image.h"
#include "network.h"
+#include "ui/uimain.h"
#include <time.h>
#if defined(EMSCRIPTEN)
diff --git a/src/emu/ui/uimain.h b/src/emu/ui/uimain.h
index 5f045a9d44c..f17b4eb0cfd 100644
--- a/src/emu/ui/uimain.h
+++ b/src/emu/ui/uimain.h
@@ -14,58 +14,11 @@
#define __BASIC_UI_H__
#include "emu.h"
-/***************************************************************************
- CONSTANTS
-***************************************************************************/
-
-// special menu item for separators
-#define MENU_SEPARATOR_ITEM "---"
-
-
-#define SLIDER_NOCHANGE 0x12345678
-
-
-typedef INT32(*slider_update)(running_machine &machine, void *arg, int id, std::string *str, INT32 newval);
-
-struct slider_state
-{
- slider_state * next; /* pointer to next slider */
- slider_update update; /* callback */
- void * arg; /* argument */
- INT32 minval; /* minimum value */
- INT32 defval; /* default value */
- INT32 maxval; /* maximum value */
- INT32 incval; /* increment value */
- int id;
- char description[1]; /* textual description */
-};
-
-// types of menu items (TODO: please expand)
-enum class ui_menu_item_type
-{
- UNKNOWN,
- SLIDER,
- SEPARATOR
-};
-
-
/***************************************************************************
TYPE DEFINITIONS
***************************************************************************/
-class ui_menu_item
-{
-public:
- const char *text;
- const char *subtext;
- UINT32 flags;
- void *ref;
- ui_menu_item_type type; // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
-
- inline bool is_selectable() const;
-};
-
class ui_manager
{
public: