Capture/ReleaseMouse() prefixed with Do for the other ports (OS/2, MGL, Motif, Mac)

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

diff --git a/include/wx/list.h b/include/wx/list.h
index 00d6126db2870bc16b7b1fb87cdfc501f19824e5..cfccbf371d7a38344669439a93541bbfadce4f7a 100644 (file)
--- 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
 // 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 wxSortCompareFunction)(const void *elem1, const void *elem2);

+}

 
 //
 typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
 
 //
 typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);


@@ -440,7 +443,7 @@ private:
             { wxListBase::Sort((wxSortCompareFunction)func); }              \
                                                                             \
     protected:                                                              \
             { wxListBase::Sort((wxSortCompareFunction)func); }              \
                                                                             \
     protected:                                                              \

-        wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,          \
+        virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,  \

                                void *data,                                  \
                                const wxListKey& key = wxDefaultListKey)     \
             {                                                               \
                                void *data,                                  \
                                const wxListKey& key = wxDefaultListKey)     \
             {                                                               \


@@ -493,9 +496,8 @@ class WXDLLEXPORT wxList : public wxObjectList
 {
 public:
     wxList(int key_type = wxKEY_NONE) : wxObjectList((wxKeyType)key_type) { }
 {
 public:
     wxList(int key_type = wxKEY_NONE) : wxObjectList((wxKeyType)key_type) { }

-#ifdef __DARWIN__
+    // this destructor is required for Darwin

    ~wxList() { }
    ~wxList() { }

-#endif

 
     wxList& operator=(const wxList& list)
         { return (wxList&)wxListBase::operator=(list); }
 
     wxList& operator=(const wxList& list)
         { return (wxList&)wxListBase::operator=(list); }