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:
@@ -497,8 +497,7 @@ void wxListCtrl::DeleteEditControl()
|
||||
{
|
||||
m_textCtrl->UnsubclassWin();
|
||||
m_textCtrl->SetHWND(0);
|
||||
delete m_textCtrl;
|
||||
m_textCtrl = NULL;
|
||||
wxDELETE(m_textCtrl);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1539,8 +1538,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
|
||||
if ( !hWnd )
|
||||
{
|
||||
// failed to start editing
|
||||
delete m_textCtrl;
|
||||
m_textCtrl = NULL;
|
||||
wxDELETE(m_textCtrl);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -2246,8 +2244,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||
if ( m_internalData[n] == data )
|
||||
{
|
||||
m_internalData.erase(m_internalData.begin() + n);
|
||||
delete data;
|
||||
data = NULL;
|
||||
wxDELETE(data);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user