X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/279338910fbf9be5229ec2ece0a896c71cc004f4..d45d30c8682f858321600e2958167d7ef54ebeb5:/include/wx/list.h diff --git a/include/wx/list.h b/include/wx/list.h index cb08945a0a..4960930946 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -65,10 +65,10 @@ enum wxKeyType // type of compare function for list sort operation (as in 'qsort'): it should // return a negative value, 0 or positive value if the first element is less // than, equal or greater than the second -typedef int (*wxSortCompareFunction)(const void *elem1, const void *elem2); +typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2); // -typedef int (*wxListIterateFunction)(void *current); +typedef int (* LINKAGEMODE wxListIterateFunction)(void *current); // ----------------------------------------------------------------------------- // key stuff: a list may be optionally keyed on integer or string key @@ -349,7 +349,7 @@ private: // retrieved from it. #define WX_DECLARE_LIST_3(T, Tbase, name, nodetype) \ - typedef int (*wxSortFuncFor_##name)(const T *, const T *); \ + typedef int (*wxSortFuncFor_##name)(const T **, const T **); \ \ class WXDLLEXPORT nodetype : public wxNodeBase \ { \ @@ -438,7 +438,7 @@ private: (nodetype *)prev, (nodetype *)next, \ (T *)data, key); \ } \ - }; + } #define WX_DECLARE_LIST_2(elementtype, listname, nodename) \ WX_DECLARE_LIST_3(elementtype, elementtype, listname, nodename)