Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 5609a82ab11800a98c84ab57339c74ce6bf6f6db..146fabde1495ee8ff7e83f2f27e7060643011c48 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -26,19 +26,19 @@
     #include "wx/hash.h"
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/hash.h"
     #include "wx/app.h"
     #include "wx/window.h"

-    #include "wx/timer.h"

     #include "wx/module.h"
 #endif
 
     #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 "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
 
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 

+#include <X11/Xlib.h>

 #include <sys/time.h>
 #include <unistd.h>
 
 #include <sys/time.h>
 #include <unistd.h>
 


@@ -98,31 +98,8 @@ bool wxEventLoopImpl::ProcessEvent(XEvent *event)
     return false;
 }
 
     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;
 }
 
     return false;
 }
 


@@ -143,15 +120,15 @@ bool wxEventLoopImpl::SendIdleEvent()
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

-wxEventLoop::~wxEventLoop()
+wxGUIEventLoop::~wxGUIEventLoop()

 {
 {

-    wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
+    wxASSERT_MSG( !m_impl, wxT("should have been deleted in Run()") );

 }
 
 }
 

-int wxEventLoop::Run()
+int wxGUIEventLoop::Run()

 {
     // event loops are not recursive, you need to create another loop!
 {
     // event loops are not recursive, you need to create another loop!

-    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
+    wxCHECK_MSG( !m_impl, -1, wxT("can't reenter a message loop") );

 
     m_impl = new wxEventLoopImpl;
 
 
     m_impl = new wxEventLoopImpl;
 


@@ -165,7 +142,7 @@ int wxEventLoop::Run()
         while ( ! Pending() )
         {
 #if wxUSE_TIMER
         while ( ! Pending() )
         {
 #if wxUSE_TIMER

-            wxTimer::NotifyTimers(); // TODO: is this the correct place for it?
+            wxGenericTimerImpl::NotifyTimers(); // TODO: is this the correct place for it?

 #endif
             if (!m_impl->SendIdleEvent())
             {
 #endif
             if (!m_impl->SendIdleEvent())
             {


@@ -185,36 +162,37 @@ int wxEventLoop::Run()
     OnExit();
 
     int exitcode = m_impl->GetExitCode();
     OnExit();
 
     int exitcode = m_impl->GetExitCode();

-    delete m_impl;
-    m_impl = NULL;
+    wxDELETE(m_impl);

 
     return exitcode;
 }
 
 
     return exitcode;
 }
 

-void wxEventLoop::Exit(int rc)
+void wxGUIEventLoop::Exit(int rc)

 {
 {

-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
-
-    m_impl->SetExitCode(rc);
-    m_impl->m_keepGoing = false;
+    if ( m_impl )
+    {
+        m_impl->SetExitCode(rc);
+        m_impl->m_keepGoing = false;
+    }

 }
 
 // ----------------------------------------------------------------------------
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 

-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const

 {
     XFlush( wxGlobalDisplay() );
     return (XPending( wxGlobalDisplay() ) > 0);
 }
 
 {
     XFlush( wxGlobalDisplay() );
     return (XPending( wxGlobalDisplay() ) > 0);
 }
 

-bool wxEventLoop::Dispatch()
+bool wxGUIEventLoop::Dispatch()

 {
 {

-    XEvent event;
+    // see comment in wxEventLoopManual::ProcessEvents()
+    if ( wxTheApp )
+        wxTheApp->ProcessPendingEvents();

 
 

-    // Start off by checking if any of our child processes have finished.
-    wxCheckForFinishedChildren();
+    XEvent event;

 
     // TODO allowing for threads, as per e.g. wxMSW
 
 
     // TODO allowing for threads, as per e.g. wxMSW
 


@@ -253,7 +231,7 @@ bool wxEventLoop::Dispatch()
             // An X11 event was pending, get it
             if (wxFD_ISSET( fd, &readset ))
                 XNextEvent( wxGlobalDisplay(), &event );
             // An X11 event was pending, get it
             if (wxFD_ISSET( fd, &readset ))
                 XNextEvent( wxGlobalDisplay(), &event );

-        }    
+        }

 #endif
     }
     else
 #endif
     }
     else


@@ -263,9 +241,39 @@ bool wxEventLoop::Dispatch()
 
 #if wxUSE_SOCKETS
     // handle any pending socket events:
 
 #if wxUSE_SOCKETS
     // handle any pending socket events:

-    wxSelectDispatcher::Get().RunLoop(0);
+    wxFDIODispatcher::DispatchPending();

 #endif
 
     (void) m_impl->ProcessEvent( &event );
     return true;
 }
 #endif
 
     (void) m_impl->ProcessEvent( &event );
     return true;
 }

+
+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+    // Sometimes only 2 yields seem
+    // to do the trick, e.g. in the
+    // progress dialog
+    int i;
+    for (i = 0; i < 2; i++)
+    {
+        m_isInsideYield = true;
+        m_eventsToProcessInsideYield = eventsToProcess;
+
+        // Call dispatch at least once so that sockets
+        // can be tested
+        wxTheApp->Dispatch();
+
+        // TODO: implement event filtering using the eventsToProcess mask
+        while (wxTheApp && wxTheApp->Pending())
+            wxTheApp->Dispatch();
+
+#if wxUSE_TIMER
+        wxGenericTimerImpl::NotifyTimers();
+#endif
+        ProcessIdle();
+
+        m_isInsideYield = false;
+    }
+
+    return true;
+}