X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea48aff3928f905ad43c7116b360fa31d76c4e76..e7dda1ffa3db91707f2a554fc3c8dffa34e0e510:/include/wx/list.h diff --git a/include/wx/list.h b/include/wx/list.h index ef40e6d6f1..e166f1423c 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -64,7 +64,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 +extern "C" +{ typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2); +} // typedef int (* LINKAGEMODE wxListIterateFunction)(void *current); @@ -183,6 +186,7 @@ private: // ----------------------------------------------------------------------------- // a double-linked list class // ----------------------------------------------------------------------------- + class WXDLLEXPORT wxListBase : public wxObject { friend class wxNodeBase; // should be able to call DetachNode() @@ -493,9 +497,8 @@ class WXDLLEXPORT wxList : public wxObjectList { public: wxList(int key_type = wxKEY_NONE) : wxObjectList((wxKeyType)key_type) { } -#ifdef __DARWIN__ + // this destructor is required for Darwin ~wxList() { } -#endif wxList& operator=(const wxList& list) { return (wxList&)wxListBase::operator=(list); } @@ -504,6 +507,9 @@ public: void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); } wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); } + +private: + DECLARE_DYNAMIC_CLASS(wxList) }; // ----------------------------------------------------------------------------- @@ -541,6 +547,8 @@ public: private: void DoCopy(const wxStringList&); // common part of copy ctor and operator= + + DECLARE_DYNAMIC_CLASS(wxStringList) }; #endif // wxLIST_COMPATIBILITY