X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3931863650d4f4d126cac1992323df5fc39833dd..a2b9e9520297da0f7d13e4cc2e36acdf2bda105d:/include/wx/arrstr.h

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 4cf5cc4acc..5eed53d2cc 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -15,8 +15,8 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-WXDLLIMPEXP_BASE int wxStringSortAscending(wxString*, wxString*);
-WXDLLIMPEXP_BASE int wxStringSortDescending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortAscending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortDescending(wxString*, wxString*);
 
 #if wxUSE_STL
 
@@ -151,13 +151,11 @@ public:
       return Item(Count() - 1);
   }
 
-#if WXWIN_COMPATIBILITY_2_4
     // return a wxString[], useful for the controls which
     // take one in their ctor.  You must delete[] it yourself
     // once you are done with it.  Will return NULL if the
     // ArrayString was empty.
   wxString* GetStringArray() const;
-#endif
 
   // item management
     // Search the element in the array, starting from the beginning if