fix memory leak in wxScreenDC, fixes #13249

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

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index 76cff5323e213e8a9ddbb5eb1eca1249cb10ab44..86a106d5568bae45cd544d0cb470ffdc5c1cd71c 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h> // for memmove
 
 #include <stdlib.h>
 #include <string.h> // for memmove
 

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

 
 // we cast the value to long from which we cast it to void * in IndexForInsert:
 // this can't work if the pointers are not big enough
 
 // we cast the value to long from which we cast it to void * in IndexForInsert:
 // this can't work if the pointers are not big enough


@@ -87,7 +87,7 @@ name::name()                                                                \
 {                                                                           \
   m_nSize  =                                                                \
   m_nCount = 0;                                                             \
 {                                                                           \
   m_nSize  =                                                                \
   m_nCount = 0;                                                             \

-  m_pItems = (T *)NULL;                                                     \
+  m_pItems = NULL;                                                     \

 }                                                                           \
                                                                             \
 /* copy ctor */                                                             \
 }                                                                           \
                                                                             \
 /* copy ctor */                                                             \


@@ -107,7 +107,7 @@ name::name(const name& src)                                                 \
       }                                                                     \
   }                                                                         \
   else                                                                      \
       }                                                                     \
   }                                                                         \
   else                                                                      \

-    m_pItems = (T *) NULL;                                                  \
+    m_pItems = NULL;                                                  \

 }                                                                           \
                                                                             \
 /* assignment operator */                                                   \
 }                                                                           \
                                                                             \
 /* assignment operator */                                                   \


@@ -129,7 +129,7 @@ name& name::operator=(const name& src)                                      \
       }                                                                     \
   }                                                                         \
   else                                                                      \
       }                                                                     \
   }                                                                         \
   else                                                                      \

-    m_pItems = (T *) NULL;                                                  \
+    m_pItems = NULL;                                                  \

                                                                             \
   return *this;                                                             \
 }                                                                           \
                                                                             \
   return *this;                                                             \
 }                                                                           \


@@ -383,7 +383,7 @@ _WX_DEFINE_BASEARRAY(double,       wxBaseArrayDouble)
     #pragma warning(pop)
 #endif
 
     #pragma warning(pop)
 #endif
 

-#else // wxUSE_STL
+#else // wxUSE_STD_CONTAINERS

 
 #include "wx/arrstr.h"
 
 
 #include "wx/arrstr.h"
 


@@ -475,32 +475,20 @@ void wxArrayString::Sort(bool reverseOrder)
     }
 }
 
     }
 }
 

-int wxSortedArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
+int wxSortedArrayString::Index(const wxString& str,
+                               bool WXUNUSED_UNLESS_DEBUG(bCase),
+                               bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const

 {
 {

-    wxSortedArrayString::const_iterator it;
+    wxASSERT_MSG( bCase && !bFromEnd,
+                  "search parameters ignored for sorted array" );

 
 

-    if (bCase)
-        it = std::lower_bound(begin(), end(), str,
-                              wxStringCompare(wxStringCmp()));
-    else
-        it = std::lower_bound(begin(), end(), str,
-                              wxStringCompare(wxStringCmpNoCase()));
+    wxSortedArrayString::const_iterator
+        it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp()));

 
 

-    if (it == end())
+    if ( it == end() || str.Cmp(*it) != 0 )

         return wxNOT_FOUND;
 
         return wxNOT_FOUND;
 

-    if (bCase)
-    {
-        if (str.Cmp(*it) != 0)
-            return wxNOT_FOUND;
-    }
-    else
-    {
-        if (str.CmpNoCase(*it) != 0)
-            return wxNOT_FOUND;
-    }
-

     return it - begin();
 }
 
     return it - begin();
 }
 

-#endif // !wxUSE_STL/wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS/wxUSE_STD_CONTAINERS