diff options
author | Vas Crabb <vas@vastheman.com> | 2019-03-26 11:13:37 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-03-26 11:13:37 +1100 |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/frontend/mame/ui/menu.h | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/frontend/mame/ui/menu.h')
-rw-r--r-- | src/frontend/mame/ui/menu.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/frontend/mame/ui/menu.h b/src/frontend/mame/ui/menu.h index 1a6c2d977f8..ffcb0ed71e8 100644 --- a/src/frontend/mame/ui/menu.h +++ b/src/frontend/mame/ui/menu.h @@ -27,6 +27,7 @@ namespace ui { + /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ @@ -35,18 +36,17 @@ class menu { public: // flags for menu items - enum + enum : unsigned { - FLAG_LEFT_ARROW = (1 << 0), - FLAG_RIGHT_ARROW = (1 << 1), - FLAG_INVERT = (1 << 2), - FLAG_MULTILINE = (1 << 3), - FLAG_REDTEXT = (1 << 4), - FLAG_DISABLE = (1 << 5), - FLAG_UI_DATS = (1 << 6), - FLAG_UI_FAVORITE = (1 << 7), - FLAG_UI_HEADING = (1 << 8), - FLAG_COLOR_BOX = (1 << 9) + FLAG_LEFT_ARROW = 1U << 0, + FLAG_RIGHT_ARROW = 1U << 1, + FLAG_INVERT = 1U << 2, + FLAG_MULTILINE = 1U << 3, + FLAG_REDTEXT = 1U << 4, + FLAG_DISABLE = 1U << 5, + FLAG_UI_DATS = 1U << 6, + FLAG_UI_HEADING = 1U << 7, + FLAG_COLOR_BOX = 1U << 8 }; virtual ~menu(); @@ -151,7 +151,6 @@ protected: void reset(reset_options options); void reset_parent(reset_options options) { m_parent->reset(options); } - void reset_topmost(reset_options options) { m_global_state->reset_topmost(options); } template <typename T> T *topmost_menu() const { return m_global_state->topmost_menu<T>(); } template <typename T> static T *topmost_menu(running_machine &machine) { return get_global_state(machine)->topmost_menu<T>(); } @@ -310,8 +309,6 @@ private: bitmap_argb32 *bgrnd_bitmap() { return m_bgrnd_bitmap.get(); } render_texture *bgrnd_texture() { return m_bgrnd_texture.get(); } - void reset_topmost(reset_options options) { if (m_stack) m_stack->reset(options); } - template <typename T> T *topmost_menu() const { return dynamic_cast<T *>(m_stack.get()); } |