diff options
Diffstat (limited to 'src/frontend/mame/ui/inputmap.h')
-rw-r--r-- | src/frontend/mame/ui/inputmap.h | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/src/frontend/mame/ui/inputmap.h b/src/frontend/mame/ui/inputmap.h index 290125c734f..522ea8bd7e9 100644 --- a/src/frontend/mame/ui/inputmap.h +++ b/src/frontend/mame/ui/inputmap.h @@ -20,8 +20,10 @@ namespace ui { class menu_input_groups : public menu { public: - menu_input_groups(mame_ui_manager &mui, render_container *container); + menu_input_groups(mame_ui_manager &mui, render_container &container); virtual ~menu_input_groups() override; + +private: virtual void populate() override; virtual void handle() override; }; @@ -29,9 +31,8 @@ public: class menu_input : public menu { public: - menu_input(mame_ui_manager &mui, render_container *container); + menu_input(mame_ui_manager &mui, render_container &container); virtual ~menu_input() override; - virtual void handle() override; protected: enum { @@ -57,10 +58,8 @@ protected: }; void populate_and_sort(struct input_item_data *itemlist); - virtual void update_input(struct input_item_data *seqchangeditem) = 0; void toggle_none_default(input_seq &selected_seq, input_seq &original_seq, const input_seq &selected_defseq); -protected: const void * pollingref; input_seq_type pollingseq; input_item_data * pollingitem; @@ -70,39 +69,41 @@ private: bool record_next; input_seq starting_seq; + virtual void handle() override; + virtual void update_input(struct input_item_data *seqchangeditem) = 0; + static int compare_items(const void *i1, const void *i2); }; class menu_input_general : public menu_input { public: - menu_input_general(mame_ui_manager &mui, render_container *container, int group); + menu_input_general(mame_ui_manager &mui, render_container &container, int group); virtual ~menu_input_general() override; + +private: virtual void populate() override; + virtual void update_input(struct input_item_data *seqchangeditem) override; -protected: int group; - virtual void update_input(struct input_item_data *seqchangeditem) override; }; class menu_input_specific : public menu_input { public: - menu_input_specific(mame_ui_manager &mui, render_container *container); + menu_input_specific(mame_ui_manager &mui, render_container &container); virtual ~menu_input_specific() override; - virtual void populate() override; -protected: +private: + virtual void populate() override; virtual void update_input(struct input_item_data *seqchangeditem) override; }; class menu_settings : public menu { public: - menu_settings(mame_ui_manager &mui, render_container *container, UINT32 type); + menu_settings(mame_ui_manager &mui, render_container &container, UINT32 type); virtual ~menu_settings() override; - virtual void populate() override; - virtual void handle() override; protected: /* DIP switch descriptor */ @@ -117,15 +118,21 @@ protected: dip_descriptor * diplist; int dipcount; int type; + +private: + virtual void populate() override; + virtual void handle() override; }; class menu_settings_dip_switches : public menu_settings { public: - menu_settings_dip_switches(mame_ui_manager &mui, render_container *container); + menu_settings_dip_switches(mame_ui_manager &mui, render_container &container); virtual ~menu_settings_dip_switches() override; +protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + private: void custom_render_one(float x1, float y1, float x2, float y2, const dip_descriptor *dip, UINT32 selectedmask); }; @@ -133,17 +140,15 @@ private: class menu_settings_driver_config : public menu_settings { public: - menu_settings_driver_config(mame_ui_manager &mui, render_container *container); + menu_settings_driver_config(mame_ui_manager &mui, render_container &container); virtual ~menu_settings_driver_config(); }; class menu_analog : public menu { public: - menu_analog(mame_ui_manager &mui, render_container *container); + menu_analog(mame_ui_manager &mui, render_container &container); virtual ~menu_analog() override; - virtual void populate() override; - virtual void handle() override; private: enum { @@ -162,6 +167,9 @@ private: int cur; int defvalue; }; + + virtual void populate() override; + virtual void handle() override; }; } // namesapce ui |