wx-config symlink creation fix

[wxWidgets.git] / src / x11 / evtloop.cpp

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 20da77c3e790b129137dab0a64b9ed38c3f4d2cf..0ac0eafb210c28881f895e78bb3261af0d86e510 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "evtloop.h"
 #endif
 
     #pragma implementation "evtloop.h"
 #endif
 


@@ -73,7 +73,7 @@ class wxSocketTable: public wxHashTable
     }
     ~wxSocketTable()
     {
     }
     ~wxSocketTable()
     {

-        DeleteContents(TRUE);
+        WX_CLEAR_HASH_TABLE(*this)

     }
 
     wxSocketTableEntry* FindEntry(int fd);
     }
 
     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();
 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();
     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();
 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();
     while (node)
     {
         wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();