Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxDELETE() and wxDELETEA() when possible.

Browse Source 
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:
Vadim Zeitlin
2010-06-20 18:18:23 +00:00
parent 9ac34ac915
commit 5276b0a53c
162 changed files with 259 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/propgrid/advprops.cpp
View File

@@ -1821,16 +1821,8 @@ void wxImageFileProperty::OnSetValue()
wxFileProperty::OnSetValue();
// Delete old image
if ( m_pImage )
{
delete m_pImage;
m_pImage = NULL;
}
if ( m_pBitmap )
{
delete m_pBitmap;
m_pBitmap = NULL;
}
wxDELETE(m_pImage);
wxDELETE(m_pBitmap);
wxFileName filename = GetFileName();
@@ -1859,8 +1851,7 @@ void wxImageFileProperty::OnCustomPaint( wxDC& dc,
{
m_pImage->Rescale( rect.width, rect.height );
m_pBitmap = new wxBitmap( *m_pImage );
delete m_pImage;
m_pImage = NULL;
wxDELETE(m_pImage);
}
dc.DrawBitmap( *m_pBitmap, rect.x, rect.y, false );