added missing wxCMPFUNC_CONVs (patch 820862)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-10-16 09:10:44 +00:00
parent 64dcc26913
commit 3931863650

View File

@ -22,7 +22,7 @@ WXDLLIMPEXP_BASE int wxStringSortDescending(wxString*, wxString*);
#include "wx/dynarray.h" #include "wx/dynarray.h"
typedef int (*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,
wxArray_SortFunction<wxString>, wxArray_SortFunction<wxString>,
@ -83,11 +83,11 @@ class WXDLLIMPEXP_BASE wxArrayString
{ {
public: public:
// type of function used by wxArrayString::Sort() // type of function used by wxArrayString::Sort()
typedef int (*CompareFunction)(const wxString& first, typedef int (wxCMPFUNC_CONV *CompareFunction)(const wxString& first,
const wxString& second); const wxString& second);
// type of function used by wxArrayString::Sort(), for compatibility with // type of function used by wxArrayString::Sort(), for compatibility with
// wxArray // wxArray
typedef int (*CompareFunction2)(wxString* first, typedef int (wxCMPFUNC_CONV *CompareFunction2)(wxString* first,
wxString* second); wxString* second);
// constructors and destructor // constructors and destructor