Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-01 00:50:40 +00:00
parent 1224b8a386
commit eea2be6ca3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/arrstr.h
View File

@@ -15,10 +15,9 @@
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/string.h" #include "wx/string.h"
#if wxUSE_STL // 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
#include "wx/dynarray.h" // could be using them
inline int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2) inline int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2)
{ {
return s1->Cmp(*s2); return s1->Cmp(*s2);
@@ -29,6 +28,10 @@ inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
return wxStringSortAscending(s2, s1); return wxStringSortAscending(s2, s1);
} }
#if wxUSE_STL
#include "wx/dynarray.h"
typedef int (wxCMPFUNC_CONV *CMPFUNCwxString)(wxString*, wxString*); typedef int (wxCMPFUNC_CONV *CMPFUNCwxString)(wxString*, wxString*);
typedef wxString _wxArraywxBaseArrayStringBase; typedef wxString _wxArraywxBaseArrayStringBase;
_WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase, _WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,