X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b79a8705e6a9d82c6b9db66214ee4a3a77bf1525..5fd588d2298a44428ac66bef1e4d9fc73e18d4fd:/include/wx/list.h diff --git a/include/wx/list.h b/include/wx/list.h index 1fd7c4808e..ed182de01f 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -25,7 +25,7 @@ #ifndef _WX_LISTH__ #define _WX_LISTH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "list.h" #endif @@ -193,7 +193,7 @@ private: class WXDLLEXPORT wxListBase : public wxObject { -friend class wxNodeBase; // should be able to call DetachNode() +friend class WXDLLEXPORT wxNodeBase; // should be able to call DetachNode() friend class wxHashTableBase; // should be able to call untyped Find() private: // common part of all ctors @@ -235,7 +235,7 @@ public: int Number() const { return GetCount(); } wxNode *First() const { return (wxNode *)GetFirst(); } wxNode *Last() const { return (wxNode *)GetLast(); } - wxNode *Nth(size_t index) const { return (wxNode *)Item(index); } + wxNode *Nth(size_t n) const { return (wxNode *)Item(n); } #endif // wxLIST_COMPATIBILITY protected: @@ -274,8 +274,12 @@ protected: wxNodeBase *Item(size_t index) const; // get the list item's data - void *operator[](size_t index) const - { wxNodeBase *node = Item(index); return node ? node->GetData() : (wxNodeBase*)NULL; } + void *operator[](size_t n) const + { + wxNodeBase *node = Item(n); + + return node ? node->GetData() : (wxNodeBase *)NULL; + } // operations // append to end of list