gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11863) -Fix (r11848): One day I'll learn C++... Delete all items in a drop down list before deleting the list.

Browse Source
This commit is contained in:
peter1138 2008-01-15 13:20:58 +00:00
parent 26c621945d
commit 932c586dfe
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/widgets/dropdown.cpp
View File

@ -30,6 +30,19 @@ StringID DropDownListParamStringItem::String() const
return this->string; return this->string;
} }
/**
* Delete all items of a drop down list and the list itself
* @param list List to delete.
*/
static void DeleteDropDownList(DropDownList *list)
{
for (DropDownList::iterator it = list->begin(); it != list->end(); ++it) {
DropDownListItem *item = *it;
delete item;
}
delete list;
}
struct dropdown_d { struct dropdown_d {
WindowClass parent_wnd_class; WindowClass parent_wnd_class;
WindowNumber parent_wnd_num; WindowNumber parent_wnd_num;
@ -160,7 +173,7 @@ static void DropDownMenuWndProc(Window *w, WindowEvent *e)
w2->InvalidateWidget(WP(w, dropdown_d).parent_button); w2->InvalidateWidget(WP(w, dropdown_d).parent_button);
} }
delete WP(w, dropdown_d).list; DeleteDropDownList(WP(w, dropdown_d).list);
} break; } break;
} }
} }
@ -172,7 +185,7 @@ void ShowDropDownList(Window *w, DropDownList *list, int selected, int button)
DeleteWindowById(WC_DROPDOWN_MENU, 0); DeleteWindowById(WC_DROPDOWN_MENU, 0);
if (is_dropdown_menu_shown) { if (is_dropdown_menu_shown) {
delete list; DeleteDropDownList(list);
return; return;
} }
@ -252,6 +265,12 @@ void ShowDropDownList(Window *w, DropDownList *list, int selected, int button)
void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int button, uint32 disabled_mask, uint32 hidden_mask) void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int button, uint32 disabled_mask, uint32 hidden_mask)
{ {
/* Don't create a new list if we're just closing an existing menu */
if (w->IsWidgetLowered(button)) {
DeleteWindowById(WC_DROPDOWN_MENU, 0);
return;
}
uint result = 0; uint result = 0;
DropDownList *list = new DropDownList(); DropDownList *list = new DropDownList();
@ -264,7 +283,7 @@ void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int butt
/* No entries in the list? */ /* No entries in the list? */
if (list->size() == 0) { if (list->size() == 0) {
delete list; DeleteDropDownList(list);
return; return;
} }