X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74039d33c7a9601159c01d8f940b5a284c4b362a..3b96fc2f1b64f78bba7c755a5c14f618962f696b:/src/motif/evtloop.cpp?ds=sidebyside

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 94f636eebf..9172b29717 100644
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "evtloop.h"
-#endif
-
 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY
@@ -83,9 +79,7 @@ private:
 
 static bool SendIdleMessage()
 {
-    wxIdleEvent event;
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();
 }
 
 bool wxEventLoopImpl::SendIdleMessage()
@@ -101,18 +95,13 @@ bool wxEventLoopImpl::SendIdleMessage()
 // 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()") );
 }
 
-bool wxEventLoop::IsRunning() const
-{
-    return m_impl != NULL;
-}
-
 int wxEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
@@ -169,11 +158,13 @@ bool wxEventLoop::Dispatch()
         ProcessXEvent( &event );
     }
     else
-#ifdef __VMS
-     XtAppProcessEvent( context, XtIMTimer|XtIMAlternateInput );
-#else
-     XtAppProcessEvent( context, XtIMTimer|XtIMAlternateInput|XtIMSignal );
+    {
+        XtAppProcessEvent( context, XtIMTimer | XtIMAlternateInput
+#ifdef XtIMSignal
+                           | XtIMSignal
 #endif
+                         );
+    }
 
     return m_impl ? m_impl->GetKeepGoing() : true;
 }
@@ -362,7 +353,7 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop )
         // leave the main loop to give other threads a chance to
         // perform their GUI work
         wxMutexGuiLeave();
-        wxUsleep(20);
+        wxMilliSleep(20);
         wxMutexGuiEnter();
     }
 #endif
@@ -392,7 +383,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop )
 #include <sys/time.h>
 #include <unistd.h>
 
-static XtInputId inputId;
 static int idleFds[2] = { -1, -1 };
 
 class wxIdlePipeModule : public wxModule
@@ -416,7 +406,7 @@ public:
         close( idleFds[1] );
     }
 private:
-    DECLARE_DYNAMIC_CLASS(wxIdlePipeModule);
+    DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule);
@@ -483,11 +473,11 @@ bool wxAddIdleCallback()
         return false;
     
     // install input handler for wxWakeUpIdle
-    inputId = XtAppAddInput( (XtAppContext) wxTheApp->GetAppContext(),
-                             idleFds[0],
-                             (XtPointer)XtInputReadMask,
-                             wxInputCallback,
-                             NULL );
+    XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
+                  idleFds[0],
+                  (XtPointer)XtInputReadMask,
+                  wxInputCallback,
+                  NULL);
 
     return true;
 }