diff options
author | 2016-03-17 22:50:29 +0100 | |
---|---|---|
committer | 2016-03-17 22:50:29 +0100 | |
commit | 421656e108e7091ee9e1b14c84f0a3f6efc2ad2e (patch) | |
tree | b71b32c3156abcdcc09f23a29586f7c8100ad6f9 /src/emu/ui/selector.cpp | |
parent | da18057256726be42d096a427c3f2ebc4fd45546 (diff) | |
parent | 78ef0f037617e074692f687d13d111af9855cf2d (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Diffstat (limited to 'src/emu/ui/selector.cpp')
-rw-r--r-- | src/emu/ui/selector.cpp | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/emu/ui/selector.cpp b/src/emu/ui/selector.cpp index 330694fd497..5f1704b79fe 100644 --- a/src/emu/ui/selector.cpp +++ b/src/emu/ui/selector.cpp @@ -18,13 +18,26 @@ // ctor / dtor //------------------------------------------------- -ui_menu_selector::ui_menu_selector(running_machine &machine, render_container *container, std::vector<std::string> s_sel, UINT16 &s_actual, int category, int _hover) - : ui_menu(machine, container), m_selector(s_actual) +ui_menu_selector::ui_menu_selector(running_machine &machine, render_container *container, std::vector<std::string> const &s_sel, UINT16 &s_actual, int category, int _hover) + : ui_menu(machine, container) + , m_selector(s_actual) + , m_category(category) + , m_hover(_hover) + , m_first_pass(true) + , m_str_items(s_sel) +{ + m_search[0] = '\0'; + m_searchlist[0] = nullptr; +} + +ui_menu_selector::ui_menu_selector(running_machine &machine, render_container *container, std::vector<std::string> &&s_sel, UINT16 &s_actual, int category, int _hover) + : ui_menu(machine, container) + , m_selector(s_actual) + , m_category(category) + , m_hover(_hover) + , m_first_pass(true) + , m_str_items(std::move(s_sel)) { - m_category = category; - m_first_pass = true; - m_hover = _hover; - m_str_items = s_sel; m_search[0] = '\0'; m_searchlist[0] = nullptr; } |