Fix memory leaks and some other errors.

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);