From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 13 Oct 2008 10:35:07 +0000 (+0000)
Subject: no need to test that the pointer is non-NULL before deleting it (closes #10070)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0b1ca1177d0affb978c2fa7ef227fd74ee83bece

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
---

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index 111109c986..3255d7dc98 100644
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -547,7 +547,6 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype,
 
 wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
 {
-  if (this->m_DCPtr != NULL)
     delete this->m_DCPtr;
 } /* wxDataViewCustomRenderer::~wxDataViewCustomRenderer() */
 
diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp
index ffca169573..cd479a6f2d 100644
--- a/src/osx/carbon/taskbar.cpp
+++ b/src/osx/carbon/taskbar.cpp
@@ -347,8 +347,7 @@ wxMenu * wxDockTaskBarIcon::DoCreatePopupMenu()
 
     if (theNewMenu)
     {
-        if (m_pMenu)
-            delete m_pMenu;
+        delete m_pMenu;
         m_pMenu = theNewMenu;
         m_pMenu->SetInvokingWindow(m_menuEventWindow);
     }
@@ -442,8 +441,7 @@ bool wxDockTaskBarIcon::PopupMenu(wxMenu *menu)
 {
     wxASSERT(menu != NULL);
 
-    if (m_pMenu)
-        delete m_pMenu;
+    delete m_pMenu;
 
     // start copy of menu
     m_pMenu = wxDeepCopyMenu(menu);
diff --git a/src/osx/carbon/tooltip.cpp b/src/osx/carbon/tooltip.cpp
index 4252ce410c..f7b4857e9e 100644
--- a/src/osx/carbon/tooltip.cpp
+++ b/src/osx/carbon/tooltip.cpp
@@ -190,8 +190,7 @@ 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 ;
+    delete m_timer ;
 
     m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
 #endif // wxUSE_TIMER
diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index 2d6242d0b3..7f68765341 100644
--- a/src/osx/core/hidjoystick.cpp
+++ b/src/osx/core/hidjoystick.cpp
@@ -174,8 +174,7 @@ wxJoystick::~wxJoystick()
     if (m_thread)
         m_thread->Delete();  // It's detached so it will delete itself
 
-    if (m_hid)
-        delete m_hid;
+    delete m_hid;
 }
 
 //---------------------------------------------------------------------------
diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp
index 522d6b8892..825c8326d7 100644
--- a/src/osx/core/printmac.cpp
+++ b/src/osx/core/printmac.cpp
@@ -411,8 +411,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     // May have pressed cancel.
     if (!dc || !dc->IsOk())
     {
-        if (dc)
-            delete dc;
+        delete dc;
         return false;
     }
 
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 3ad07ae4d2..ebec85144e 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -448,8 +448,7 @@ void wxWindowMac::DoReleaseMouse()
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
-    if ( m_dropTarget != NULL )
-        delete m_dropTarget;
+    delete m_dropTarget;
 
     m_dropTarget = pDropTarget;
     if ( m_dropTarget != NULL )