X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/x11/evtloop.cpp?ds=sidebyside

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index aaf03464a3..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,10 +171,10 @@ 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->Data();
+        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
         
         if (entry->m_fdInput != -1)
         {
@@ -197,10 +197,10 @@ 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->Data();
+        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
         
         if (entry->m_fdInput != -1 && FD_ISSET(entry->m_fdInput, readset))
         {
@@ -335,10 +335,7 @@ bool wxEventLoopImpl::PreProcessEvent(XEvent *event)
 
 bool wxEventLoopImpl::SendIdleEvent()
 {
-    wxIdleEvent event;
-    event.SetEventObject(wxTheApp);
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();
 }
 
 // ============================================================================