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

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>
 
 #include <sys/time.h>
 #include <unistd.h>
 

+#if wxUSE_SOCKETS

 // ----------------------------------------------------------------------------
 // wxSocketTable
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxSocketTable
 // ----------------------------------------------------------------------------


@@ -246,6 +247,7 @@ extern "C" void wxUnregisterSocketCallback(int fd, wxSocketTableType socketType)
         wxTheSocketTable->UnregisterCallback(fd, socketType);
     }
 }
         wxTheSocketTable->UnregisterCallback(fd, socketType);
     }
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
 
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl


@@ -469,8 +471,10 @@ bool wxEventLoop::Dispatch()
         
         FD_SET(fd, &readset);
 
         
         FD_SET(fd, &readset);
 

+#if wxUSE_SOCKETS

         if (wxTheSocketTable)
             wxTheSocketTable->FillSets(& readset, & writeset, & highest);
         if (wxTheSocketTable)
             wxTheSocketTable->FillSets(& readset, & writeset, & highest);

+#endif

         
         if (select(highest+1, &readset, &writeset, NULL, & tv) == 0)
         {
         
         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 (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);
             // Check if any socket events were pending,
             // and if so, call their callbacks
             if (wxTheSocketTable)
                 wxTheSocketTable->ProcessEvents(& readset, & writeset);

+#endif

         }
 #endif
     } else
         }
 #endif
     } else

diff --git a/src/x11/gsockx11.c b/src/x11/gsockx11.c
index fa848319955a26360314cea0d25fbe65bce9a8d4..1eabbedac923456bc635731c1bb565d530ed7035 100644 (file)
--- a/src/x11/gsockx11.c
+++ b/src/x11/gsockx11.c
@@ -14,7 +14,7 @@
 #include "wx/unix/gsockunx.h"
 
 /*
 #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
  */
 
  * in evtloop.cpp and gsockx11.c
  */