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:
@@ -469,14 +469,13 @@ bool wxHtmlWindow::DoSetPage(const wxString& source)
|
||||
SetBackgroundImage(wxNullBitmap);
|
||||
|
||||
m_Parser->SetDC(dc);
|
||||
if (m_Cell)
|
||||
{
|
||||
delete m_Cell;
|
||||
// notice that it's important to set m_Cell to NULL here before calling
|
||||
// Parse() below, even if it will be overwritten by its return value:
|
||||
// without this we may crash if it's used from inside Parse()
|
||||
m_Cell = NULL;
|
||||
}
|
||||
|
||||
// notice that it's important to set m_Cell to NULL here before calling
|
||||
// Parse() below, even if it will be overwritten by its return value as
|
||||
// without this we may crash if it's used from inside Parse(), so use
|
||||
// wxDELETE() and not just delete here
|
||||
wxDELETE(m_Cell);
|
||||
|
||||
m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc);
|
||||
delete dc;
|
||||
m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
|
||||
|
Reference in New Issue
Block a user