use wxDC::SetDeviceClippingRegion() instead of deprecated SetClippingRegion()

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 3e1e5213ef8368cc9bb13f76434474fdd6db53ec..eab9042841002696f901b3471fe326e8d5b77c4e 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -29,16 +29,16 @@
     #include "wx/module.h"
 #endif
 
-#include "wx/private/selectdispatcher.h"
+#include "wx/private/fdiodispatcher.h"
 #include "wx/unix/private.h"
 #include "wx/x11/private.h"
-#include "X11/Xlib.h"
 #include "wx/generic/private/timer.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 
+#include <X11/Xlib.h>
 #include <sys/time.h>
 #include <unistd.h>
 
@@ -98,31 +98,8 @@ bool wxEventLoopImpl::ProcessEvent(XEvent *event)
     return false;
 }
 
-bool wxEventLoopImpl::PreProcessEvent(XEvent *event)
+bool wxEventLoopImpl::PreProcessEvent(XEvent *WXUNUSED(event))
 {
-    // TODO
-#if 0
-    HWND hWnd = msg->hwnd;
-    wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd);
-
-
-    // try translations first; find the youngest window with a translation
-    // table.
-    wxWindow *wnd;
-    for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
-    {
-        if ( wnd->MSWTranslateMessage((WXMSG *)msg) )
-            return true;
-    }
-
-    // Anyone for a non-translation message? Try youngest descendants first.
-    for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
-    {
-        if ( wnd->MSWProcessMessage((WXMSG *)msg) )
-            return true;
-    }
-#endif
-
     return false;
 }
 
@@ -213,9 +190,6 @@ bool wxGUIEventLoop::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,
@@ -263,7 +237,7 @@ bool wxGUIEventLoop::Dispatch()
 
 #if wxUSE_SOCKETS
     // handle any pending socket events:
-    wxSelectDispatcher::DispatchPending();
+    wxFDIODispatcher::DispatchPending();
 #endif
 
     (void) m_impl->ProcessEvent( &event );