diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-04-30 21:52:29 +0000 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-04-30 21:56:50 +0300 |
| commit | fcfc0bfbcc57c09f0f20e77dc0dee335ae736135 (patch) | |
| tree | a96de85a85dd8f964771c68c94241f5c62b1748c /src/gui | |
| parent | a946678bc7f37475ecef5b4282a77bc4e0f1afa7 (diff) | |
| download | manaplus-fcfc0bfbcc57c09f0f20e77dc0dee335ae736135.tar.gz manaplus-fcfc0bfbcc57c09f0f20e77dc0dee335ae736135.tar.bz2 manaplus-fcfc0bfbcc57c09f0f20e77dc0dee335ae736135.tar.xz manaplus-fcfc0bfbcc57c09f0f20e77dc0dee335ae736135.zip | |
fix warnings on sunon compilation.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/dropdown.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/popuplist.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index eba9ab9dd..be1fbbb7c 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -54,7 +54,7 @@ static std::string const dropdownFiles[2] = DropDown::DropDown(const Widget2 *const widget, ListModel *const listModel, - const bool extended, + const bool isExtended, const Modal modal, ActionListener *const listener, const std::string &eventId) : @@ -64,7 +64,7 @@ DropDown::DropDown(const Widget2 *const widget, MouseListener(), FocusListener(), SelectionListener(), - mPopup(CREATEWIDGETR(PopupList, this, listModel, extended, modal)), + mPopup(CREATEWIDGETR(PopupList, this, listModel, isExtended, modal)), mShadowColor(getThemeColor(ThemeColorId::DROPDOWN_SHADOW, 255U)), mHighlightColor(getThemeColor(ThemeColorId::HIGHLIGHT, 255U)), mPadding(1), @@ -72,7 +72,7 @@ DropDown::DropDown(const Widget2 *const widget, mSpacing(0), mFoldedUpHeight(0), mSelectionListeners(), - mExtended(extended), + mExtended(isExtended), mDroppedDown(false), mPushed(false), mIsDragged(false) diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp index 627a6cfe6..c6412a69b 100644 --- a/src/gui/widgets/popuplist.cpp +++ b/src/gui/widgets/popuplist.cpp @@ -33,12 +33,12 @@ PopupList::PopupList(DropDown *const widget, ListModel *const listModel, - const bool extended, + const bool isExtended, const Modal modal) : Popup("PopupList", "popuplist.xml"), FocusListener(), mListModel(listModel), - mListBox(extended ? CREATEWIDGETR(ExtendedListBox, + mListBox(isExtended ? CREATEWIDGETR(ExtendedListBox, widget, listModel, "extendedlistbox.xml", 0) : CREATEWIDGETR(ListBox, widget, listModel, "popuplistbox.xml")), |