Don't make wxQsort() extern "C" nor use any special convention for it.
It doesn't make sense to require passing C functions to wxQsort() that we define in a C++ library. We also don't need any special calling convention here. Notice that the only existing uses of wxQsort() inside wxWidgets itself were not actually extern "C" and one of them didn't even use the correct calling convention. Also avoid using non-wx-prefixed CMPFUNCDATA identifier in a public header, rename it to wxSortCallback instead. Finally make wxQsort() documentation slightly more useful. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -588,14 +588,14 @@ WXDLLIMPEXP_BASE bool wxGetDiskSpace(const wxString& path,
|
||||
|
||||
|
||||
|
||||
extern "C"
|
||||
{
|
||||
typedef int (wxCMPFUNC_CONV *CMPFUNCDATA)(const void* pItem1, const void* pItem2, const void* user_data);
|
||||
}
|
||||
typedef int (*wxSortCallback)(const void* pItem1,
|
||||
const void* pItem2,
|
||||
const void* user_data);
|
||||
|
||||
|
||||
WXDLLIMPEXP_BASE void wxQsort(void *const pbase, size_t total_elems,
|
||||
size_t size, CMPFUNCDATA cmp, const void* user_data);
|
||||
WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems,
|
||||
size_t size, wxSortCallback cmp,
|
||||
const void* user_data);
|
||||
|
||||
|
||||
#if wxUSE_GUI // GUI only things from now on
|
||||
|
Reference in New Issue
Block a user