reorganized wxBitmap/wxBitmapHandler classes to use wxBitmapType instead of "long...

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

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 429de81069e6bd914732d7ca953110be39acd528..a9843d9cda15f41de6625c5c1a8217d37a31ff28 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/evtloop.cpp
+// Name:        src/gtk/evtloop.cpp

 // Purpose:     implements wxEventLoop for GTK+
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implements wxEventLoop for GTK+
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "evtloop.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,7 +25,11 @@
 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

-#include "wx/app.h"
+#include "wx/ptr_scpd.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 


@@ -56,39 +56,34 @@ private:
 // wxEventLoop implementation
 // ============================================================================
 
 // wxEventLoop implementation
 // ============================================================================
 

+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl)
+

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

-wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
-
-wxEventLoop::~wxEventLoop()
+wxGUIEventLoop::~wxGUIEventLoop()

 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 

-int wxEventLoop::Run()
+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") );
 
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 

-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+    wxEventLoopActivator activate(this);

 
 

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

 
     gtk_main();
 
 
     gtk_main();
 

-    int exitcode = m_impl->GetExitCode();
-    delete m_impl;
-    m_impl = NULL;
+    OnExit();

 
 

-    ms_activeLoop = oldLoop;
-
-    return exitcode;
+    return m_impl->GetExitCode();

 }
 
 }
 

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

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


@@ -101,27 +96,22 @@ void wxEventLoop::Exit(int rc)
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 

-extern bool g_isIdle;
-
-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const

 {
 {

-    if (wxTheApp && !g_isIdle)
-    {
-        // We need to remove idle callbacks or gtk_events_pending will
-        // never return false.
-        wxTheApp->RemoveIdleTag();
-        g_isIdle = TRUE;
-    }
-
-    return gtk_events_pending();
+    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;

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );

 
 

-    gtk_main_iteration();
-
-    return TRUE;
+    // gtk_main_iteration() returns TRUE only if gtk_main_quit() was called
+    return !gtk_main_iteration();

 }
 }

-