Partially applied patch [ 763900 ] fix for vertical toolbar

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 7fe2592efb518ff128036fbf22e086a1ebbb253e..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
 // ============================================================================
 
+#if !wxUSE_STL
+
+#include "wx/arrstr.h"
+
 // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
 #define   ARRAY_MAXSIZE_INCREMENT       4096
 
@@ -2181,6 +2185,8 @@ bool wxArrayString::operator==(const wxArrayString& a) const
     return TRUE;
 }
 
+#endif // !wxUSE_STL
+
 int wxStringSortAscending(wxString* s1, wxString* s2)
 {
     return wxStrcmp(s1->c_str(), s2->c_str());