Remove deletes for images from scroll list GUI Elements

Resources are deleted by ~PageSet and do not need to be deleted
by the the scrollable list elements. This fixes a crash when
reloading the theme.

Also remove some deletes for items that should not be deleted in
button and input GUI elements.

Change-Id: Ie1c1b85c81c10f648d085746a5fdba6220468a5f
This commit is contained in:
Ethan Yonker
2015-02-10 13:19:02 -06:00
parent de72b6d4d8
commit 1b6199f8ed
6 changed files with 0 additions and 12 deletions
-1
View File
@@ -130,7 +130,6 @@ GUIButton::~GUIButton()
if (mButtonImg) delete mButtonImg;
if (mButtonLabel) delete mButtonLabel;
if (mAction) delete mAction;
if (mButtonIcon) delete mButtonIcon;
}
int GUIButton::Render(void)
-2
View File
@@ -141,8 +141,6 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) : GUIScrollList(node)
GUIFileSelector::~GUIFileSelector()
{
delete mFileIcon;
delete mFolderIcon;
}
int GUIFileSelector::Update(void)
-2
View File
@@ -214,8 +214,6 @@ GUIInput::GUIInput(xml_node<>* node)
GUIInput::~GUIInput()
{
if (mInputText) delete mInputText;
if (mBackground) delete mBackground;
if (mCursor) delete mCursor;
if (mAction) delete mAction;
}
-2
View File
@@ -103,8 +103,6 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIScrollList(node)
GUIListBox::~GUIListBox()
{
delete mIconSelected;
delete mIconUnselected;
}
int GUIListBox::Update(void)
-2
View File
@@ -96,8 +96,6 @@ GUIPartitionList::GUIPartitionList(xml_node<>* node) : GUIScrollList(node)
GUIPartitionList::~GUIPartitionList()
{
delete mIconSelected;
delete mIconUnselected;
}
int GUIPartitionList::Update(void)
-3
View File
@@ -259,9 +259,6 @@ GUIScrollList::GUIScrollList(xml_node<>* node) : GUIObject(node)
GUIScrollList::~GUIScrollList()
{
delete mHeaderIcon;
delete mBackground;
delete mFont;
}
void GUIScrollList::SetMaxIconSize(int w, int h)