added missing wxCMPFUNC_CONVs (patch 820862)

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index de3508e9c8ea7d05d70854249f5878e4013a4edb..4cf5cc4accdcfc36b5c925ef26beafb9a46438bc 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -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;
 _WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,
                         wxArray_SortFunction<wxString>,
 typedef wxString _wxArraywxBaseArrayStringBase;
 _WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,
                         wxArray_SortFunction<wxString>,


@@ -83,11 +83,11 @@ class WXDLLIMPEXP_BASE wxArrayString
 {
 public:
   // type of function used by wxArrayString::Sort()
 {
 public:
   // type of function used by wxArrayString::Sort()

-  typedef int (*CompareFunction)(const wxString& first,
+  typedef int (wxCMPFUNC_CONV *CompareFunction)(const wxString& first,

                                  const wxString& second);
   // type of function used by wxArrayString::Sort(), for compatibility with
   // wxArray
                                  const wxString& second);
   // type of function used by wxArrayString::Sort(), for compatibility with
   // wxArray

-  typedef int (*CompareFunction2)(wxString* first,
+  typedef int (wxCMPFUNC_CONV *CompareFunction2)(wxString* first,

                                   wxString* second);
 
   // constructors and destructor
                                   wxString* second);
 
   // constructors and destructor