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:
@@ -234,8 +234,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
|
||||
{
|
||||
if (m_client)
|
||||
{
|
||||
delete m_client;
|
||||
m_client = NULL;
|
||||
wxDELETE(m_client);
|
||||
}
|
||||
event.Skip();
|
||||
}
|
||||
@@ -261,8 +260,7 @@ void MyFrame::OnStart(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
if (!retval)
|
||||
{
|
||||
delete m_client;
|
||||
m_client = NULL;
|
||||
wxDELETE(m_client);
|
||||
}
|
||||
EnableControls();
|
||||
}
|
||||
@@ -316,8 +314,7 @@ void MyFrame::OnDisconnect(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
void MyFrame::Disconnect()
|
||||
{
|
||||
delete m_client;
|
||||
m_client = NULL;
|
||||
wxDELETE(m_client);
|
||||
EnableControls();
|
||||
}
|
||||
|
||||
@@ -399,8 +396,7 @@ void MyClient::Disconnect()
|
||||
if (m_connection)
|
||||
{
|
||||
m_connection->Disconnect();
|
||||
delete m_connection;
|
||||
m_connection = NULL;
|
||||
wxDELETE(m_connection);
|
||||
wxGetApp().GetFrame()->EnableControls();
|
||||
wxLogMessage(wxT("Client disconnected from server"));
|
||||
}
|
||||
|
Reference in New Issue
Block a user