test for GL/glu.h too (fixes part of bug 879474)

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 85b83d888048faa2e855f14a27b1942ad9baf801..b62ce72440522179e793cc076ff5a9b3fa3d1ebf 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -20,16 +20,17 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/evtloop.h"
+
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
+    #include "wx/app.h"
+    #include "wx/window.h"
+    #include "wx/timer.h"
+    #include "wx/module.h"
 #endif
 
-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/evtloop.h"
 #include "wx/tooltip.h"
-#include "wx/timer.h"
-#include "wx/module.h"
 #include "wx/unix/private.h"
 #include "wx/x11/private.h"
 #include "X11/Xlib.h"
@@ -41,6 +42,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#ifdef HAVE_SYS_SELECT_H
+#   include <sys/select.h>
+#endif
+
 #if wxUSE_SOCKETS
 // ----------------------------------------------------------------------------
 // wxSocketTable
@@ -75,7 +80,7 @@ class wxSocketTable: public wxHashTable
     wxSocketTable(): wxHashTable(wxKEY_INTEGER)
     {
     }
-    ~wxSocketTable()
+    virtual ~wxSocketTable()
     {
         WX_CLEAR_HASH_TABLE(*this)
     }
@@ -429,6 +434,9 @@ bool wxEventLoop::Dispatch()
 {
     XEvent event;
 
+    // Start off by checking if any of our child processes have finished.
+    wxCheckForFinishedChildren();
+
     // TODO allowing for threads, as per e.g. wxMSW
 
     // This now waits until either an X event is received,