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:
@@ -2034,21 +2034,18 @@ void wxComboCtrlBase::DestroyPopup()
|
||||
if ( m_popup )
|
||||
m_popup->RemoveEventHandler(m_popupEvtHandler);
|
||||
|
||||
delete m_popupEvtHandler;
|
||||
wxDELETE(m_popupEvtHandler);
|
||||
|
||||
delete m_popupInterface;
|
||||
wxDELETE(m_popupInterface);
|
||||
|
||||
if ( m_winPopup )
|
||||
{
|
||||
m_winPopup->RemoveEventHandler(m_popupWinEvtHandler);
|
||||
delete m_popupWinEvtHandler;
|
||||
m_popupWinEvtHandler = NULL;
|
||||
wxDELETE(m_popupWinEvtHandler);
|
||||
m_winPopup->Destroy();
|
||||
m_winPopup = NULL;
|
||||
}
|
||||
|
||||
m_popupEvtHandler = NULL;
|
||||
m_popupInterface = NULL;
|
||||
m_winPopup = NULL;
|
||||
m_popup = NULL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user