* Fixed two memory leaks.

[wxWidgets.git] / src / common / dynarray.cpp

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index eb2b4e6be9c6cafe2663f5803ffbbb571de2fb91..305a1f07d4f147238839bec84bdad70b8234d246 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -53,7 +53,7 @@ wxBaseArray::wxBaseArray()
 {
   m_uiSize  =
   m_uiCount = 0;
 {
   m_uiSize  =
   m_uiCount = 0;

-  m_pItems  = NULL;
+  m_pItems  = (long *) NULL;

 }
 
 // copy ctor
 }
 
 // copy ctor


@@ -67,13 +67,20 @@ wxBaseArray::wxBaseArray(const wxBaseArray& src)
     memcpy(m_pItems, src.m_pItems, m_uiCount*sizeof(long));
   }
   else
     memcpy(m_pItems, src.m_pItems, m_uiCount*sizeof(long));
   }
   else

-    m_pItems = NULL;
+    m_pItems = (long *) NULL;

 }
 
 // assignment operator
 wxBaseArray& wxBaseArray::operator=(const wxBaseArray& src)
 {
 }
 
 // assignment operator
 wxBaseArray& wxBaseArray::operator=(const wxBaseArray& src)
 {

+#if 0

   wxDELETEA(m_pItems);
   wxDELETEA(m_pItems);

+#else
+       if ( (m_pItems)) { 
+               delete (m_pItems); 
+               (m_pItems) = 0; 
+       }
+#endif

 
   m_uiSize  = // not src.m_uiSize to save memory
   m_uiCount = src.m_uiCount;
 
   m_uiSize  = // not src.m_uiSize to save memory
   m_uiCount = src.m_uiCount;


@@ -83,7 +90,7 @@ wxBaseArray& wxBaseArray::operator=(const wxBaseArray& src)
     memcpy(m_pItems, src.m_pItems, m_uiCount*sizeof(long));
   }
   else
     memcpy(m_pItems, src.m_pItems, m_uiCount*sizeof(long));
   }
   else

-    m_pItems = NULL;
+    m_pItems = (long *) NULL;

 
   return *this;
 }
 
   return *this;
 }