use own mutex for region iterator locking, not gui one

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 60170332894f2c0e64d5674461b4e45aa02b0fda..f15fe0451608005b3ec46deb0e0f95642191adee 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -37,6 +37,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#if wxUSE_SOCKETS
 // ----------------------------------------------------------------------------
 // wxSocketTable
 // ----------------------------------------------------------------------------
@@ -246,6 +247,7 @@ extern "C" void wxUnregisterSocketCallback(int fd, wxSocketTableType socketType)
         wxTheSocketTable->UnregisterCallback(fd, socketType);
     }
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
@@ -469,8 +471,10 @@ bool wxEventLoop::Dispatch()
         
         FD_SET(fd, &readset);
 
+#if wxUSE_SOCKETS
         if (wxTheSocketTable)
             wxTheSocketTable->FillSets(& readset, & writeset, & highest);
+#endif
         
         if (select(highest+1, &readset, &writeset, NULL, & tv) == 0)
         {
@@ -483,10 +487,12 @@ bool wxEventLoop::Dispatch()
             if (FD_ISSET(fd, & readset))
                 XNextEvent((Display*) wxGetDisplay(), & event);
 
+#if wxUSE_SOCKETS
             // Check if any socket events were pending,
             // and if so, call their callbacks
             if (wxTheSocketTable)
                 wxTheSocketTable->ProcessEvents(& readset, & writeset);
+#endif
         }
 #endif
     } else