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:
@@ -264,11 +264,7 @@ wxAdvImageFileProperty::wxAdvImageFileProperty( const wxString& label,
|
||||
wxAdvImageFileProperty::~wxAdvImageFileProperty ()
|
||||
{
|
||||
// Delete old image
|
||||
if ( m_pImage )
|
||||
{
|
||||
delete m_pImage;
|
||||
m_pImage = (wxImage*) NULL;
|
||||
}
|
||||
wxDELETE(m_pImage);
|
||||
}
|
||||
|
||||
void wxAdvImageFileProperty::OnSetValue()
|
||||
@@ -276,11 +272,7 @@ void wxAdvImageFileProperty::OnSetValue()
|
||||
wxFileProperty::OnSetValue();
|
||||
|
||||
// Delete old image
|
||||
if ( m_pImage )
|
||||
{
|
||||
delete m_pImage;
|
||||
m_pImage = (wxImage*) NULL;
|
||||
}
|
||||
wxDELETE(m_pImage);
|
||||
|
||||
wxString imagename = GetValueAsString(0);
|
||||
|
||||
@@ -398,11 +390,7 @@ void wxAdvImageFileProperty::LoadThumbnails( size_t index )
|
||||
|
||||
}
|
||||
|
||||
if ( m_pImage )
|
||||
{
|
||||
delete m_pImage;
|
||||
m_pImage = (wxImage*) NULL;
|
||||
}
|
||||
wxDELETE(m_pImage);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user