X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..a87bf37838e09fb4634a887cc8a6055104b49a01:/src/x11/evtloop.cpp diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp index 20da77c3e7..0ac0eafb21 100644 --- a/src/x11/evtloop.cpp +++ b/src/x11/evtloop.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "evtloop.h" #endif @@ -73,7 +73,7 @@ class wxSocketTable: public wxHashTable } ~wxSocketTable() { - DeleteContents(TRUE); + WX_CLEAR_HASH_TABLE(*this) } wxSocketTableEntry* FindEntry(int fd); @@ -171,7 +171,7 @@ bool wxSocketTable::CallCallback(int fd, wxSocketTableType socketType) void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest) { BeginFind(); - wxNode* node = Next(); + wxHashTable::compatibility_iterator node = Next(); while (node) { wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData(); @@ -197,7 +197,7 @@ void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest) void wxSocketTable::ProcessEvents(fd_set* readset, fd_set* writeset) { BeginFind(); - wxNode* node = Next(); + wxHashTable::compatibility_iterator node = Next(); while (node) { wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();