diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-30 23:57:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-31 01:04:53 +0300 |
| commit | 91a51ec64c35713914b22f2d9a283dc5b4091c12 (patch) | |
| tree | 0289142a45284514a8981b02601c83ac1039dd5d /src/gui/widgets | |
| parent | d629f56517f55d1fd756c4774d9a368d66f615df (diff) | |
| download | manaplus-91a51ec64c35713914b22f2d9a283dc5b4091c12.tar.gz manaplus-91a51ec64c35713914b22f2d9a283dc5b4091c12.tar.bz2 manaplus-91a51ec64c35713914b22f2d9a283dc5b4091c12.tar.xz manaplus-91a51ec64c35713914b22f2d9a283dc5b4091c12.zip | |
Fix memory leaks and some other errors.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/tabbedarea.cpp | 11 | ||||
| -rw-r--r-- | src/gui/widgets/window.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index c9f1269aa..b76385f03 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -130,6 +130,7 @@ ItemContainer::~ItemContainer() } delete mItemPopup; mItemPopup = 0; + delete []mShowMatrix; } void ItemContainer::logic() diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index f4b4a78f8..6b90cb381 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -46,13 +46,10 @@ TabbedArea::TabbedArea() : gcn::TabbedArea(), TabbedArea::~TabbedArea() { - if (!mEnableScrollButtons) - { - delete mArrowButton[0]; - mArrowButton[0] = 0; - delete mArrowButton[1]; - mArrowButton[1] = 0; - } + delete mArrowButton[0]; + mArrowButton[0] = 0; + delete mArrowButton[1]; + mArrowButton[1] = 0; } void TabbedArea::enableScrollButtons(bool enable) diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 22daa5dc9..3531ac245 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -106,6 +106,8 @@ Window::~Window() while (!mWidgets.empty()) delete mWidgets.front(); + mWidgets.clear(); + // need mWidgets.clean ? removeWidgetListener(this); |