1. regenerated the makefiles to include menucmn.cpp

[wxWidgets.git] / include / wx / list.h

diff --git a/include/wx/list.h b/include/wx/list.h
index 01eddf8190c42140e75a4fbb582d68f4c9b78ccb..496093094638fa4fdcf176f2b9395913075acdb7 100644 (file)
--- 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
 // 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
 
 // -----------------------------------------------------------------------------
 // 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)                         \
 //     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                          \
     {                                                                       \
                                                                             \
     class WXDLLEXPORT nodetype : public wxNodeBase                          \
     {                                                                       \