diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-18 00:45:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-18 00:45:23 +0300 |
| commit | 14a0a04b2bb3928f7429fd748dd40e1843fca571 (patch) | |
| tree | 28f772d80afd66838b0123efeac005f445a39bce /src/gui/windows/emotewindow.cpp | |
| parent | 1d71d02a40dc1f4c50572bf0681bbc2907a3c361 (diff) | |
| download | manaplus-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/emotewindow.cpp')
| -rw-r--r-- | src/gui/windows/emotewindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |