thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed memory leak in TabWidget

Browse source 
svn-id: r11191
This commit is contained in:
Max Horn 2003-11-07 14:50:32 +00:00
parent 496d19d461
commit 767fc87148
5 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gui/TabWidget.cpp
View file

@ -42,6 +42,14 @@ TabWidget::TabWidget(GuiObject *boss, int x, int y, int w, int h)
_tabWidth = 40;
}
TabWidget::~TabWidget() {
for (int i = 0; i < _tabs.size(); ++i) {
delete _tabs[i].firstWidget;
_tabs[i].firstWidget = 0;
}
_tabs.clear();
}
int16 TabWidget::getChildY() const {
return getAbsY() + kTabHeight;
}

1
gui/TabWidget.h
View file

@ -39,6 +39,7 @@ protected:
public:
TabWidget(GuiObject *boss, int x, int y, int w, int h);
~TabWidget();
virtual int16 getChildY() const;

8
gui/dialog.cpp
View file

@ -35,13 +35,7 @@
*/
Dialog::~Dialog() {
Widget *w = _firstWidget, *next;
while (w) {
next = w->_next;
w->_next = 0;
delete w;
w = next;
}
delete _firstWidget;
_firstWidget = 0;
}

4
gui/widget.cpp
View file

@ -33,6 +33,10 @@ Widget::Widget(GuiObject *boss, int x, int y, int w, int h)
_boss->_firstWidget = this;
}
Widget::~Widget() {
delete _next;
}
void Widget::draw() {
NewGui *gui = &g_gui;

2
gui/widget.h
View file

@ -78,7 +78,7 @@ public:
public:
Widget(GuiObject *boss, int x, int y, int w, int h);
virtual ~Widget() {}
virtual ~Widget();
virtual int16 getAbsX() const { return _x + _boss->getChildX(); }
virtual int16 getAbsY() const { return _y + _boss->getChildY(); }