From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Oct 2003 09:10:44 +0000 (+0000)
Subject: added missing wxCMPFUNC_CONVs (patch 820862)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3931863650d4f4d126cac1992323df5fc39833dd

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 de3508e9c8..4cf5cc4acc 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -22,7 +22,7 @@ WXDLLIMPEXP_BASE int wxStringSortDescending(wxString*, wxString*);
 
 #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>,
@@ -83,11 +83,11 @@ class WXDLLIMPEXP_BASE wxArrayString
 {
 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
-  typedef int (*CompareFunction2)(wxString* first,
+  typedef int (wxCMPFUNC_CONV *CompareFunction2)(wxString* first,
                                   wxString* second);
 
   // constructors and destructor