diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-19 12:50:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-19 15:12:22 +0300 |
| commit | e4d34f9e3f5b2068be1a8137c75a571e9da42cda (patch) | |
| tree | 97d0e13dd2f163e9ce91576b29eec8563899097c /src/gui/widgets | |
| parent | ecc414fed44c8b0ee63c0acf188a109e3867a815 (diff) | |
| download | mv-e4d34f9e3f5b2068be1a8137c75a571e9da42cda.tar.gz mv-e4d34f9e3f5b2068be1a8137c75a571e9da42cda.tar.bz2 mv-e4d34f9e3f5b2068be1a8137c75a571e9da42cda.tar.xz mv-e4d34f9e3f5b2068be1a8137c75a571e9da42cda.zip | |
move virtual member calls from textpopup constructor into postInit.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/characterdisplay.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp index 9d409a6bb..fb2ec9e2f 100644 --- a/src/gui/widgets/characterdisplay.cpp +++ b/src/gui/widgets/characterdisplay.cpp @@ -47,6 +47,8 @@ CharacterDisplay::CharacterDisplay(const Widget2 *const widget, mName(new Label(this, "wwwwwwwwwwwwwwwwwwwwwwww")), mPopup(new TextPopup) { + mPopup->postInit(); + mPlayerBox->setActionEventId("select"); mPlayerBox->addActionListener(charSelectDialog); setActionEventId("use"); diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 8ce8fad17..5e2666fd8 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -46,6 +46,8 @@ EmoteShortcutContainer::EmoteShortcutContainer(): mEmoteClicked(false), mEmoteMoved(0) { + mEmotePopup->postInit(); + addMouseListener(this); addWidgetListener(this); |