diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-14 18:05:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-14 18:05:10 +0300 |
| commit | c5a623b0787b4a6708f2bf039f5aaa8be65d7e29 (patch) | |
| tree | 27ffeb7fc86ed33c7832c9786c97e5058dfde9c7 /src/gui | |
| parent | b58f0063f5863ae22a973e5dd1c7bae70ca2e0ba (diff) | |
| download | manaplus-c5a623b0787b4a6708f2bf039f5aaa8be65d7e29.tar.gz manaplus-c5a623b0787b4a6708f2bf039f5aaa8be65d7e29.tar.bz2 manaplus-c5a623b0787b4a6708f2bf039f5aaa8be65d7e29.tar.xz manaplus-c5a623b0787b4a6708f2bf039f5aaa8be65d7e29.zip | |
Use CREATEWIDGET macro in popuplist.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/popuplist.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp index 17f026388..d5adb1dcf 100644 --- a/src/gui/widgets/popuplist.cpp +++ b/src/gui/widgets/popuplist.cpp @@ -22,6 +22,7 @@ #include "gui/gui.h" +#include "gui/widgets/createwidget.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/extendedlistbox.h" #include "gui/widgets/scrollarea.h" @@ -35,15 +36,15 @@ PopupList::PopupList(DropDown *const widget, Popup("PopupList", "popuplist.xml"), FocusListener(), mListModel(listModel), - mListBox(extended ? new ExtendedListBox( + mListBox(extended ? CREATEWIDGETR(ExtendedListBox, widget, listModel, "extendedlistbox.xml", 0) : - new ListBox(widget, listModel, "popuplistbox.xml")), + CREATEWIDGETR(ListBox, + widget, listModel, "popuplistbox.xml")), mScrollArea(new ScrollArea(this, mListBox, false)), mDropDown(widget), mPressedIndex(-2), mModal(modal) { - mListBox->postInit(); mListBox->setMouseConsume(false); mScrollArea->setMouseConsume(false); mAllowLogic = false; |