summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-18 00:45:23 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-18 00:45:23 +0300
commit14a0a04b2bb3928f7429fd748dd40e1843fca571 (patch)
tree28f772d80afd66838b0123efeac005f445a39bce /src/gui/windows
parent1d71d02a40dc1f4c50572bf0681bbc2907a3c361 (diff)
downloadmanaplus-14a0a04b2bb3928f7429fd748dd40e1843fca571.tar.gz
manaplus-14a0a04b2bb3928f7429fd748dd40e1843fca571.tar.bz2
manaplus-14a0a04b2bb3928f7429fd748dd40e1843fca571.tar.xz
manaplus-14a0a04b2bb3928f7429fd748dd40e1843fca571.zip
Remove default constructor from Widget2.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/buydialog.cpp2
-rw-r--r--src/gui/windows/charcreatedialog.cpp4
-rw-r--r--src/gui/windows/connectiondialog.cpp2
-rw-r--r--src/gui/windows/emotewindow.cpp4
-rw-r--r--src/gui/windows/equipmentwindow.cpp3
-rw-r--r--src/gui/windows/itemamountwindow.cpp4
-rw-r--r--src/gui/windows/selldialog.cpp2
7 files changed, 11 insertions, 10 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 19a46b9b8..4d2acfac9 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -244,7 +244,7 @@ void BuyDialog::init()
getOptionBool("showbackground"), "buy_background.xml");
mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
- mSlider = new Slider(1.0);
+ mSlider = new Slider(this, 1.0);
mQuantityLabel = new Label(this, strprintf(
"%d / %d", mAmountItems, mMaxItems));
mQuantityLabel->setAlignment(Graphics::CENTER);
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index a3fdcde3a..d6b572d40 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -124,7 +124,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
mMaxLook(CharDB::getMaxLook()),
mPlayer(new Being(0, ActorSprite::PLAYER, static_cast<uint16_t>(mRace),
nullptr)),
- mPlayerBox(new PlayerBox(mPlayer, "charcreate_playerbox.xml",
+ mPlayerBox(new PlayerBox(this, mPlayer, "charcreate_playerbox.xml",
"charcreate_selectedplayerbox.xml")),
mHairStyle(0),
mHairColor(0),
@@ -528,7 +528,7 @@ void CharCreateDialog::setAttributes(const StringVect &labels,
mAttributeLabel[i]->adjustSize();
add(mAttributeLabel[i]);
- mAttributeSlider[i] = new Slider(min, max);
+ mAttributeSlider[i] = new Slider(this, min, max);
mAttributeSlider[i]->setDimension(gcn::Rectangle(140, y + i * 24,
150, 12));
mAttributeSlider[i]->setActionEventId("statslider");
diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp
index 0d0633ff8..1a7c23187 100644
--- a/src/gui/windows/connectiondialog.cpp
+++ b/src/gui/windows/connectiondialog.cpp
@@ -41,7 +41,7 @@ ConnectionDialog::ConnectionDialog(const std::string &text,
setMovable(false);
setMinWidth(0);
- ProgressIndicator *const progressIndicator = new ProgressIndicator;
+ ProgressIndicator *const progressIndicator = new ProgressIndicator(this);
Label *const label = new Label(this, text);
Button *const cancelButton = new Button(
// TRANSLATORS: connection dialog button
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index 5f3aa1bb1..d94344090 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -51,10 +51,10 @@ EmoteWindow::EmoteWindow() :
mEmotePage(new EmotePage(this)),
mColorModel(ColorModel::createDefault(this)),
mColorPage(new ColorPage(this, mColorModel, "colorpage.xml")),
- mScrollColorPage(new ScrollArea(mColorPage, false, "emotepage.xml")),
+ mScrollColorPage(new ScrollArea(this, mColorPage, false, "emotepage.xml")),
mFontModel(new NamesModel),
mFontPage(new ListBox(this, mFontModel, "")),
- mScrollFontPage(new ScrollArea(mFontPage, false, "fontpage.xml")),
+ mScrollFontPage(new ScrollArea(this, mFontPage, false, "fontpage.xml")),
mImageSet(Theme::getImageSetFromThemeXml("emotetabs.xml", "", 17, 16))
{
mTabs->postInit();
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 6f2bb3b3d..01f74c50d 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -59,7 +59,8 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment,
ActionListener(),
mEquipment(equipment),
mItemPopup(new ItemPopup),
- mPlayerBox(new PlayerBox("equipment_playerbox.xml",
+ mPlayerBox(new PlayerBox(this,
+ "equipment_playerbox.xml",
"equipment_selectedplayerbox.xml")),
// TRANSLATORS: equipment window button
mUnequip(new Button(this, _("Unequip"), "unequip", this)),
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 6b7d10173..8e981ae96 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -148,7 +148,7 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
mMax(maxRange),
mUsage(usage),
mItemPopup(new ItemPopup),
- mItemAmountSlide(new Slider(1.0, mMax)),
+ mItemAmountSlide(new Slider(this, 1.0, mMax)),
mItemPriceSlide(nullptr),
mItemDropDown(nullptr),
mItemsModal(nullptr),
@@ -182,7 +182,7 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
mItemPriceTextField->setWidth(35);
mItemPriceTextField->addKeyListener(this);
- mItemPriceSlide = new Slider(1.0, 10000000);
+ mItemPriceSlide = new Slider(this, 1.0, 10000000);
mItemPriceSlide->setHeight(10);
mItemPriceSlide->setActionEventId("slidePrice");
mItemPriceSlide->addActionListener(this);
diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp
index aad3619ba..b79d18dcf 100644
--- a/src/gui/windows/selldialog.cpp
+++ b/src/gui/windows/selldialog.cpp
@@ -90,7 +90,7 @@ void SellDialog::init()
getOptionBool("showbackground"), "sell_background.xml");
mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
- mSlider = new Slider(1.0);
+ mSlider = new Slider(this, 1.0);
mQuantityLabel = new Label(this, strprintf(
"%d / %d", mAmountItems, mMaxItems));