summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2008-01-15 13:20:58 +0000
committerpeter1138 <peter1138@openttd.org>2008-01-15 13:20:58 +0000
commitc954ce1b335e37b25bf604a529c57f5043f3b7d9 (patch)
treea058e358318aa76713520a0811a1b4b671a7f552
parentfcee6dad935ccd877cdbed05e5c4154dd04b580b (diff)
downloadopenttd-c954ce1b335e37b25bf604a529c57f5043f3b7d9.tar.xz
(svn r11863) -Fix (r11848): One day I'll learn C++... Delete all items in a drop down list before deleting the list.
-rw-r--r--src/widgets/dropdown.cpp25
1 files changed, 22 insertions, 3 deletions
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
index e7f680e6b..9488216be 100644
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -30,6 +30,19 @@ StringID DropDownListParamStringItem::String() const
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 {
WindowClass parent_wnd_class;
WindowNumber parent_wnd_num;
@@ -160,7 +173,7 @@ static void DropDownMenuWndProc(Window *w, WindowEvent *e)
w2->InvalidateWidget(WP(w, dropdown_d).parent_button);
}
- delete WP(w, dropdown_d).list;
+ DeleteDropDownList(WP(w, dropdown_d).list);
} break;
}
}
@@ -172,7 +185,7 @@ void ShowDropDownList(Window *w, DropDownList *list, int selected, int button)
DeleteWindowById(WC_DROPDOWN_MENU, 0);
if (is_dropdown_menu_shown) {
- delete list;
+ DeleteDropDownList(list);
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)
{
+ /* 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;
DropDownList *list = new DropDownList();
@@ -264,7 +283,7 @@ void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int butt
/* No entries in the list? */
if (list->size() == 0) {
- delete list;
+ DeleteDropDownList(list);
return;
}