Move marker_delete_are_you_sure_menu select handling to event_handler

This commit is contained in:
Kp 2021-06-28 03:37:49 +00:00
parent ce8a5d4275
commit 53cd92727e

View file

@ -287,11 +287,12 @@ struct marker_delete_are_you_sure_menu : std::array<newmenu_item, 2>, newmenu
{
}
virtual int subfunction_handler(const d_event &) override;
virtual window_event_result event_handler(const d_event &) override;
static std::pair<imobjidx_t *, game_marker_index> get_marker_object(d_marker_state &MarkerState);
void handle_selected_yes() const;
};
int marker_delete_are_you_sure_menu::subfunction_handler(const d_event &event)
window_event_result marker_delete_are_you_sure_menu::event_handler(const d_event &event)
{
switch (event.type)
{
@ -303,11 +304,16 @@ int marker_delete_are_you_sure_menu::subfunction_handler(const d_event &event)
handle_selected_yes();
/* The dialog should close after the user picks Yes or No.
*/
return 0;
return window_event_result::close;
}
default:
break;
return newmenu::event_handler(event);
}
}
int marker_delete_are_you_sure_menu::subfunction_handler(const d_event &event)
{
(void)event;
return 0;
}