no need to test that the pointer is non-NULL before deleting it (closes #10070)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -547,7 +547,6 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype,
|
||||
|
||||
wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
|
||||
{
|
||||
if (this->m_DCPtr != NULL)
|
||||
delete this->m_DCPtr;
|
||||
} /* wxDataViewCustomRenderer::~wxDataViewCustomRenderer() */
|
||||
|
||||
|
@@ -347,7 +347,6 @@ wxMenu * wxDockTaskBarIcon::DoCreatePopupMenu()
|
||||
|
||||
if (theNewMenu)
|
||||
{
|
||||
if (m_pMenu)
|
||||
delete m_pMenu;
|
||||
m_pMenu = theNewMenu;
|
||||
m_pMenu->SetInvokingWindow(m_menuEventWindow);
|
||||
@@ -442,7 +441,6 @@ bool wxDockTaskBarIcon::PopupMenu(wxMenu *menu)
|
||||
{
|
||||
wxASSERT(menu != NULL);
|
||||
|
||||
if (m_pMenu)
|
||||
delete m_pMenu;
|
||||
|
||||
// start copy of menu
|
||||
|
@@ -190,7 +190,6 @@ void wxMacToolTip::Setup( WindowRef win , const wxString& text , const wxPoint&
|
||||
s_ToolTipWindowRef = m_window ;
|
||||
m_backpict = NULL ;
|
||||
#if wxUSE_TIMER
|
||||
if ( m_timer )
|
||||
delete m_timer ;
|
||||
|
||||
m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
|
||||
|
@@ -174,7 +174,6 @@ wxJoystick::~wxJoystick()
|
||||
if (m_thread)
|
||||
m_thread->Delete(); // It's detached so it will delete itself
|
||||
|
||||
if (m_hid)
|
||||
delete m_hid;
|
||||
}
|
||||
|
||||
|
@@ -411,7 +411,6 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
|
||||
// May have pressed cancel.
|
||||
if (!dc || !dc->IsOk())
|
||||
{
|
||||
if (dc)
|
||||
delete dc;
|
||||
return false;
|
||||
}
|
||||
|
@@ -448,7 +448,6 @@ void wxWindowMac::DoReleaseMouse()
|
||||
|
||||
void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
|
||||
{
|
||||
if ( m_dropTarget != NULL )
|
||||
delete m_dropTarget;
|
||||
|
||||
m_dropTarget = pDropTarget;
|
||||
|
Reference in New Issue
Block a user