Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after deleting them instead of doing it manually. Closes #9685. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -86,8 +86,7 @@ Palette::Palette() {
|
||||
|
||||
Palette::~Palette() {
|
||||
Release();
|
||||
delete [] entries;
|
||||
entries = 0;
|
||||
wxDELETEA(entries);
|
||||
}
|
||||
|
||||
void Palette::Release() {
|
||||
@@ -1144,14 +1143,8 @@ ListBoxImpl::ListBoxImpl()
|
||||
}
|
||||
|
||||
ListBoxImpl::~ListBoxImpl() {
|
||||
if (imgList) {
|
||||
delete imgList;
|
||||
imgList = NULL;
|
||||
}
|
||||
if (imgTypeMap) {
|
||||
delete imgTypeMap;
|
||||
imgTypeMap = NULL;
|
||||
}
|
||||
wxDELETE(imgList);
|
||||
wxDELETE(imgTypeMap);
|
||||
}
|
||||
|
||||
|
||||
@@ -1329,14 +1322,8 @@ void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
|
||||
}
|
||||
|
||||
void ListBoxImpl::ClearRegisteredImages() {
|
||||
if (imgList) {
|
||||
delete imgList;
|
||||
imgList = NULL;
|
||||
}
|
||||
if (imgTypeMap) {
|
||||
delete imgTypeMap;
|
||||
imgTypeMap = NULL;
|
||||
}
|
||||
wxDELETE(imgList);
|
||||
wxDELETE(imgTypeMap);
|
||||
if (wid)
|
||||
GETLB(wid)->SetImageList(NULL, wxIMAGE_LIST_SMALL);
|
||||
}
|
||||
|
Reference in New Issue
Block a user