From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 1 Sep 2008 00:50:40 +0000 (+0000)
Subject: define wxStringSortAscneding/Descending() even in non-STL build for compatibility
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eea2be6ca3e1da988c805dfa42a0061c769c2a20

define wxStringSortAscneding/Descending() even in non-STL build for compatibility

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 306af0c54c..4c099c36b2 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -15,10 +15,9 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-#if wxUSE_STL
-
-#include "wx/dynarray.h"
-
+// these functions are only used in STL build now but we define them in any
+// case for compatibility with the existing code outside of the library which
+// could be using them
 inline int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2)
 {
     return s1->Cmp(*s2);
@@ -29,6 +28,10 @@ inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
     return wxStringSortAscending(s2, s1);
 }
 
+#if wxUSE_STL
+
+#include "wx/dynarray.h"
+
 typedef int (wxCMPFUNC_CONV *CMPFUNCwxString)(wxString*, wxString*);
 typedef wxString _wxArraywxBaseArrayStringBase;
 _WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,