From 2d1084ea5d12797371d64fc3a96a18668e19b16d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 18 Aug 2002 08:09:36 +0000 Subject: [PATCH] Don't compile socket table if wxUSE_SOCKET is 0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/evtloop.cpp | 6 ++++++ src/x11/gsockx11.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp index 6017033289..f15fe04516 100644 --- a/src/x11/evtloop.cpp +++ b/src/x11/evtloop.cpp @@ -37,6 +37,7 @@ #include #include +#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 diff --git a/src/x11/gsockx11.c b/src/x11/gsockx11.c index fa84831995..1eabbedac9 100644 --- a/src/x11/gsockx11.c +++ b/src/x11/gsockx11.c @@ -14,7 +14,7 @@ #include "wx/unix/gsockunx.h" /* - * TODO: have these in a common header instead of being repeated + * FIXME: have these in a common header instead of being repeated * in evtloop.cpp and gsockx11.c */ -- 2.45.2