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

Replaced 'delete' calls with wxDELETE() calls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2002-01-02 15:25:17 +00:00
parent 2e8b69c748
commit 3fb676f87d
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/src/xrc/xml.cpp
View File

@@ -92,8 +92,8 @@ wxXmlNode::~wxXmlNode()
wxXmlNode& wxXmlNode::operator=(const wxXmlNode& node) wxXmlNode& wxXmlNode::operator=(const wxXmlNode& node)
{ {
delete m_properties; wxDELETE(m_properties);
delete m_children; wxDELETE(m_children);
DoCopy(node); DoCopy(node);
return *this; return *this;
} }
@@ -303,8 +303,7 @@ wxXmlDocument::wxXmlDocument(const wxString& filename, wxXmlIOType io_type)
{ {
if (!Load(filename, io_type)) if (!Load(filename, io_type))
{ {
delete m_root; wxDELETE(m_root);
m_root = NULL;
} }
} }
@@ -315,8 +314,7 @@ wxXmlDocument::wxXmlDocument(wxInputStream& stream, wxXmlIOType io_type)
{ {
if (!Load(stream, io_type)) if (!Load(stream, io_type))
{ {
delete m_root; wxDELETE(m_root);
m_root = NULL;
} }
} }
@@ -331,7 +329,7 @@ wxXmlDocument::wxXmlDocument(const wxXmlDocument& doc)
wxXmlDocument& wxXmlDocument::operator=(const wxXmlDocument& doc) wxXmlDocument& wxXmlDocument::operator=(const wxXmlDocument& doc)
{ {
delete m_root; wxDELETE(m_root);
DoCopy(doc); DoCopy(doc);
return *this; return *this;
} }
@@ -417,8 +415,7 @@ void wxXmlDocument::AddHandler(wxXmlIOHandler *handler)
void wxXmlDocument::CleanUpHandlers() void wxXmlDocument::CleanUpHandlers()
{ {
delete sm_handlers; wxDELETE(sm_handlers);
sm_handlers = NULL;
} }

15
src/xrc/xml.cpp
View File

@@ -92,8 +92,8 @@ wxXmlNode::~wxXmlNode()
wxXmlNode& wxXmlNode::operator=(const wxXmlNode& node) wxXmlNode& wxXmlNode::operator=(const wxXmlNode& node)
{ {
delete m_properties; wxDELETE(m_properties);
delete m_children; wxDELETE(m_children);
DoCopy(node); DoCopy(node);
return *this; return *this;
} }
@@ -303,8 +303,7 @@ wxXmlDocument::wxXmlDocument(const wxString& filename, wxXmlIOType io_type)
{ {
if (!Load(filename, io_type)) if (!Load(filename, io_type))
{ {
delete m_root; wxDELETE(m_root);
m_root = NULL;
} }
} }
@@ -315,8 +314,7 @@ wxXmlDocument::wxXmlDocument(wxInputStream& stream, wxXmlIOType io_type)
{ {
if (!Load(stream, io_type)) if (!Load(stream, io_type))
{ {
delete m_root; wxDELETE(m_root);
m_root = NULL;
} }
} }
@@ -331,7 +329,7 @@ wxXmlDocument::wxXmlDocument(const wxXmlDocument& doc)
wxXmlDocument& wxXmlDocument::operator=(const wxXmlDocument& doc) wxXmlDocument& wxXmlDocument::operator=(const wxXmlDocument& doc)
{ {
delete m_root; wxDELETE(m_root);
DoCopy(doc); DoCopy(doc);
return *this; return *this;
} }
@@ -417,8 +415,7 @@ void wxXmlDocument::AddHandler(wxXmlIOHandler *handler)
void wxXmlDocument::CleanUpHandlers() void wxXmlDocument::CleanUpHandlers()
{ {
delete sm_handlers; wxDELETE(sm_handlers);
sm_handlers = NULL;
} }