(blind) fix for valgrind error

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 76251136cad3b9696f2e2611c6190331471204b7..42863abaa81ac61538c19b36893323130520317f 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1753,6 +1753,10 @@ wxString& wxString::replace(size_t nStart, size_t nLen,
 // ArrayString
 // ============================================================================
 
 // ArrayString
 // ============================================================================
 

+#if !wxUSE_STL
+
+#include "wx/arrstr.h"
+

 // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
 #define   ARRAY_MAXSIZE_INCREMENT       4096
 
 // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
 #define   ARRAY_MAXSIZE_INCREMENT       4096
 


@@ -2153,15 +2157,11 @@ void wxArrayString::Sort(CompareFunction2 compareFunction)
   qsort(m_pItems, m_nCount, sizeof(wxChar *), (wxStringCompareFn)compareFunction);
 }
 
   qsort(m_pItems, m_nCount, sizeof(wxChar *), (wxStringCompareFn)compareFunction);
 }
 

-#if WXWIN_COMPATIBILITY_2_4
-

 void wxArrayString::Sort(bool reverseOrder)
 {
   Sort(reverseOrder ? wxStringSortDescending : wxStringSortAscending);
 }
 
 void wxArrayString::Sort(bool reverseOrder)
 {
   Sort(reverseOrder ? wxStringSortDescending : wxStringSortAscending);
 }
 

-#endif // WXWIN_COMPATIBILITY_2_4
-

 void wxArrayString::DoSort()
 {
   wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") );
 void wxArrayString::DoSort()
 {
   wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") );


@@ -2185,6 +2185,8 @@ bool wxArrayString::operator==(const wxArrayString& a) const
     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif // !wxUSE_STL
+

 int wxStringSortAscending(wxString* s1, wxString* s2)
 {
     return wxStrcmp(s1->c_str(), s2->c_str());
 int wxStringSortAscending(wxString* s1, wxString* s2)
 {
     return wxStrcmp(s1->c_str(), s2->c_str());