TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove unused EVENT_WINDOW_CLOSED

Browse source 
Every callee that recognized EVENT_WINDOW_CLOSED did so only to
explicitly ignore it.  Remove the code to send it and all sites that
ignored it.
This commit is contained in:
Kp 2016-10-10 00:25:15 +00:00
parent 8d98eb474e
commit 1af65071d7
5 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/arch/sdl/window.cpp
View file

@ -65,7 +65,6 @@ int window_close(window *wind)
{
window *prev;
d_event event;
window_event_result (*w_callback)(window *wind,const d_event &event, void *data) = wind->w_callback;
if (wind == window_get_front())
WINDOW_SEND_EVENT(wind, EVENT_WINDOW_DEACTIVATED); // Deactivate first
@ -82,10 +81,6 @@ int window_close(window *wind)
if ((prev = window_get_front()))
WINDOW_SEND_EVENT(prev, EVENT_WINDOW_ACTIVATED);
event.type = EVENT_WINDOW_CLOSED;
w_callback(nullptr, event, nullptr); // callback needs to recognise nullptr is being passed!
return 1;
}

1
common/include/event.h
View file

@ -36,7 +36,6 @@ enum event_type : unsigned
EVENT_WINDOW_DEACTIVATED,
EVENT_WINDOW_DRAW,
EVENT_WINDOW_CLOSE,
EVENT_WINDOW_CLOSED,
EVENT_NEWMENU_DRAW, // draw after the newmenu stuff is drawn (e.g. savegame previews)
EVENT_NEWMENU_CHANGED, // an item had its value/text changed

3
common/ui/dialog.cpp
View file

@ -94,8 +94,7 @@ static void ui_dialog_draw(UI_DIALOG *dlg)
// The dialog handler borrows heavily from the newmenu_handler
static window_event_result ui_dialog_handler(window *wind,const d_event &event, UI_DIALOG *dlg)
{
if (event.type == EVENT_WINDOW_CLOSED ||
event.type == EVENT_WINDOW_ACTIVATED ||
if (event.type == EVENT_WINDOW_ACTIVATED ||
event.type == EVENT_WINDOW_DEACTIVATED)
return window_event_result::ignored;

3
similar/main/game.cpp
View file

@ -1311,9 +1311,6 @@ window_event_result game_handler(window *,const d_event &event, const unused_win
key_toggle_repeat(1);
break;
case EVENT_WINDOW_CLOSED:
break;
default:
break;
}

6
similar/main/newmenu.cpp
View file

@ -1512,9 +1512,6 @@ static window_event_result newmenu_draw(window *wind, newmenu *menu)
static window_event_result newmenu_handler(window *wind,const d_event &event, newmenu *menu)
{
if (event.type == EVENT_WINDOW_CLOSED)
return window_event_result::ignored;
if (menu->subfunction)
{
int rval = (*menu->subfunction)(menu, event, menu->userdata);
@ -2038,9 +2035,6 @@ static window_event_result listbox_draw(window *, listbox *lb)
static window_event_result listbox_handler(window *wind,const d_event &event, listbox *lb)
{
if (event.type == EVENT_WINDOW_CLOSED)
return window_event_result::ignored;
if (lb->listbox_callback)
{
int rval = (*lb->listbox_callback)(lb, event, lb->userdata);