From: Robert Roebling Date: Thu, 18 Sep 2008 19:05:21 +0000 (+0000) Subject: Move definition of wxListIteratorFunction and ..SortFuntion to defs.h so it can be... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4f47a8d0c680404c5a7f05c11c8d9fa5a6c9ade7?ds=sidebyside Move definition of wxListIteratorFunction and ..SortFuntion to defs.h so it can be used from elsewhere git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/defs.h b/include/wx/defs.h index 393d320a16..6255413213 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2666,6 +2666,21 @@ enum wxUpdateUI wxUPDATE_UI_FROMIDLE = 0x0002 /* Invoked from On(Internal)Idle */ }; + +/* ---------------------------------------------------------------------------- */ +/* wxList types */ +/* ---------------------------------------------------------------------------- */ + +/* 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 (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2); + +/* wxList iterator function */ +typedef int (* LINKAGEMODE wxListIterateFunction)(void *current); + + /* ---------------------------------------------------------------------------- */ /* miscellaneous */ /* ---------------------------------------------------------------------------- */ diff --git a/include/wx/list.h b/include/wx/list.h index a09bc6158d..b88449f12f 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -45,21 +45,9 @@ // types // ---------------------------------------------------------------------------- -// 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 - -extern "C" -{ -typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2); -} - class WXDLLIMPEXP_FWD_BASE wxObjectListNode; typedef wxObjectListNode wxNode; -// -typedef int (* LINKAGEMODE wxListIterateFunction)(void *current); - #if wxUSE_STL #define wxLIST_COMPATIBILITY