Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/autoreplace_gui.cpp
This commit is contained in:
pelya
2014-06-15 22:32:06 +03:00
80 changed files with 337 additions and 396 deletions

View File

@@ -116,6 +116,8 @@ struct DropdownWindow : Window {
DropdownWindow(Window *parent, const DropDownList *list, int selected, int button, bool instant_close, const Point &position, const Dimension &size, Colours wi_colour, bool scroll)
: Window(&_dropdown_desc)
{
assert(list->Length() > 0);
this->position = position;
this->CreateNestedTree();