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:
@@ -405,11 +405,7 @@ void wxToolBar::Recreate()
|
||||
m_hBitmap = 0;
|
||||
}
|
||||
|
||||
if ( m_disabledImgList )
|
||||
{
|
||||
delete m_disabledImgList;
|
||||
m_disabledImgList = NULL;
|
||||
}
|
||||
wxDELETE(m_disabledImgList);
|
||||
|
||||
Realize();
|
||||
}
|
||||
@@ -610,11 +606,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
|
||||
|
||||
void wxToolBar::CreateDisabledImageList()
|
||||
{
|
||||
if (m_disabledImgList != NULL)
|
||||
{
|
||||
delete m_disabledImgList;
|
||||
m_disabledImgList = NULL;
|
||||
}
|
||||
wxDELETE(m_disabledImgList);
|
||||
|
||||
// as we can't use disabled image list with older versions of comctl32.dll,
|
||||
// don't even bother creating it
|
||||
|
Reference in New Issue
Block a user