adding protected inquiry function whether a child window belongs to the 'client'...

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

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 9ff74e58c315aa606e8db50963fd67c4cdf8db47..ac59d77edbda27c8c045cd377c0116a98b5cbf63 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -28,10 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

+#include "wx/app.h"

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


@@ -62,18 +60,13 @@ private:
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;

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

-bool wxEventLoop::IsRunning() const
-{
-    return m_impl != NULL;
-}
-

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


@@ -110,7 +103,14 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
 
 bool wxEventLoop::Pending() const
 {

-    return gtk_events_pending() > 0;
+    if (wxTheApp)
+    {
+        // We need to remove idle callbacks or gtk_events_pending will
+        // never return false.
+        wxTheApp->RemoveIdleTag();
+    }
+
+    return gtk_events_pending();

 }
 
 bool wxEventLoop::Dispatch()
 }
 
 bool wxEventLoop::Dispatch()