diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-06-13 13:16:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-06-13 13:16:16 -0600 |
| commit | e8bea8a6edf69e824a922adeb5e697111ceabe90 (patch) | |
| tree | db1937956bc585b300f2a2c8312af4ad5bf924de /src/gui/socialwindow.cpp | |
| parent | 593fd2b831304c8e421589aab0fb158e4b7e9c35 (diff) | |
| parent | 0b15a3ad32838134384524ce4af95d65b0b4e5da (diff) | |
| download | Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.gz Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.bz2 Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.xz Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.zip | |
Merge remote branch '1.0/1.0'
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
Diffstat (limited to 'src/gui/socialwindow.cpp')
| -rw-r--r-- | src/gui/socialwindow.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 2043da52..25447f30 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -61,7 +61,7 @@ protected: mConfirmDialog(NULL) {} - ~SocialTab() + virtual ~SocialTab() { // Cleanup dialogs if (mInviteDialog) @@ -106,6 +106,14 @@ public: mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); } + ~GuildTab() + { + delete mList; + mList = 0; + delete mScroll; + mScroll = 0; + } + void action(const gcn::ActionEvent &event) { if (event.getId() == "do invite") @@ -179,6 +187,14 @@ public: mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); } + ~PartyTab() + { + delete mList; + mList = 0; + delete mScroll; + mScroll = 0; + } + void action(const gcn::ActionEvent &event) { if (event.getId() == "do invite") @@ -350,6 +366,7 @@ SocialWindow::~SocialWindow() mPartyInviter = ""; } + delete mCreatePopup; } bool SocialWindow::addTab(Guild *guild) |