implement wxEventLoop::DispatchTimeout() for wxGTK (thanks Paul) and rewrote it to...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 8be6dfa654340444c8361d2335f181ff622d7d48..551ccfd39a1130a5d00dbd0e5361f5a9119307c9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2352,6 +2352,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
        wx/gtk/dcmemory.h \
        wx/gtk/dcscreen.h \
        wx/gtk/dnd.h \
        wx/gtk/dcmemory.h \
        wx/gtk/dcscreen.h \
        wx/gtk/dnd.h \

+       wx/gtk/evtloop.h \

        wx/gtk/font.h \
        wx/gtk/minifram.h \
        wx/gtk/pen.h \
        wx/gtk/font.h \
        wx/gtk/minifram.h \
        wx/gtk/pen.h \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index a8a67ac5bcd07bfcd65dd83492284f3f15782faa..12e8537af6426d594a9bc8e13ab6cf8e858d4d36 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1027,6 +1027,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/dcmemory.h
     wx/gtk/dcscreen.h
     wx/gtk/dnd.h
     wx/gtk/dcmemory.h
     wx/gtk/dcscreen.h
     wx/gtk/dnd.h

+    wx/gtk/evtloop.h

     wx/gtk/font.h
     wx/gtk/minifram.h
     wx/gtk/pen.h
     wx/gtk/font.h
     wx/gtk/minifram.h
     wx/gtk/pen.h

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 412fe4ea5155b6add159b9c5766de6cb72756c30..c0fc1e7055054eb091917d5dc93dcce1fa45bb9e 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -126,6 +126,8 @@ protected:
     #include "wx/osx/evtloop.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/evtloop.h"
     #include "wx/osx/evtloop.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/evtloop.h"

+#elif defined(__WXGTK20__)
+    #include "wx/gtk/evtloop.h"

 #else // other platform
 
 #include "wx/stopwatch.h"   // for wxMilliClock_t
 #else // other platform
 
 #include "wx/stopwatch.h"   // for wxMilliClock_t

diff --git a/include/wx/gtk/evtloop.h b/include/wx/gtk/evtloop.h
new file mode 100644 (file)
index 0000000..b47e187
--- /dev/null
+++ b/include/wx/gtk/evtloop.h
@@ -0,0 +1,37 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/evtloop.h
+// Purpose:     wxGTK event loop implementation
+// Author:      Vadim Zeitlin
+// Created:     2008-12-27
+// RCS-ID:      $Id$
+// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_EVTLOOP_H_
+#define _WX_GTK_EVTLOOP_H_
+
+// ----------------------------------------------------------------------------
+// wxGUIEventLoop for wxGTK
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
+{
+public:
+    wxGUIEventLoop();
+
+    virtual int Run();
+    virtual void Exit(int rc = 0);
+    virtual bool Pending() const;
+    virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);
+    virtual void WakeUp();
+
+protected:
+    // the exit code of this event loop
+    int m_exitcode;
+
+    DECLARE_NO_COPY_CLASS(wxGUIEventLoop)
+};
+
+#endif // _WX_GTK_EVTLOOP_H_

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index a9843d9cda15f41de6625c5c1a8217d37a31ff28..a609bed7296cb87a56045b80334f9b53bdf35ac8 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

-#include "wx/ptr_scpd.h"

 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"


@@ -33,79 +32,65 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-// ----------------------------------------------------------------------------
-// wxEventLoopImpl
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxEventLoopImpl
-{
-public:
-    // ctor
-    wxEventLoopImpl() { SetExitCode(0); }
-
-    // set/get the exit code
-    void SetExitCode(int exitcode) { m_exitcode = exitcode; }
-    int GetExitCode() const { return m_exitcode; }
-
-private:
-    // the exit code of the event loop
-    int m_exitcode;
-};
-

 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 

-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl)
-

 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

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

 {
 {

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

 }
 
 int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
 }
 
 int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!

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

 
     wxEventLoopActivator activate(this);
 
 
     wxEventLoopActivator activate(this);
 

-    wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
-

     gtk_main();
 
     OnExit();
 
     gtk_main();
 
     OnExit();
 

-    return m_impl->GetExitCode();
+    return m_exitcode;

 }
 
 void wxGUIEventLoop::Exit(int rc)
 {
 }
 
 void wxGUIEventLoop::Exit(int rc)
 {

-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
+    wxCHECK_RET( IsRunning(), "can't call Exit() if not running" );

 
 

-    m_impl->SetExitCode(rc);
+    m_exitcode = rc;

 
     gtk_main_quit();
 }
 
 
     gtk_main_quit();
 }
 

+void wxGUIEventLoop::WakeUp()
+{
+    // TODO: idle events handling should really be done by wxEventLoop itself
+    //       but for now it's completely in gtk/app.cpp so just call there when
+    //       we have wxTheApp and hope that it doesn't matter that we do
+    //       nothing when we don't...
+    if ( wxTheApp )
+        wxTheApp->WakeUpIdle();
+}
+

 // ----------------------------------------------------------------------------
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 
 bool wxGUIEventLoop::Pending() const
 {
 // ----------------------------------------------------------------------------
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 
 bool wxGUIEventLoop::Pending() const
 {

-    bool pending;
-    wxApp* app = wxTheApp;
-    if (app != NULL)
-        // app->EventsPending() avoids false positives from our idle source
-        pending = app->EventsPending();
-    else
-        pending = gtk_events_pending() != 0;
-    return pending;
+    if ( wxTheApp )
+    {
+        // this avoids false positives from our idle source
+        return wxTheApp->EventsPending();
+    }
+
+    return gtk_events_pending() != 0;

 }
 
 bool wxGUIEventLoop::Dispatch()
 }
 
 bool wxGUIEventLoop::Dispatch()


@@ -115,3 +100,30 @@ bool wxGUIEventLoop::Dispatch()
     // gtk_main_iteration() returns TRUE only if gtk_main_quit() was called
     return !gtk_main_iteration();
 }
     // gtk_main_iteration() returns TRUE only if gtk_main_quit() was called
     return !gtk_main_iteration();
 }

+
+extern "C" {
+static gboolean wx_event_loop_timeout(void* data)
+{
+    bool* expired = static_cast<bool*>(data);
+    *expired = true;
+
+    // return FALSE to remove this timeout
+    return FALSE;
+}
+}
+
+int wxGUIEventLoop::DispatchTimeout(unsigned long timeout)
+{
+    bool expired = false;
+    const unsigned id = g_timeout_add(timeout, wx_event_loop_timeout, &expired);
+    bool quit = gtk_main_iteration() != 0;
+
+    if ( expired )
+        return -1;
+
+    g_source_remove(id);
+
+    return !quit;
+}
+
+