fixing osx_carbon

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

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index fa1db8c84ceb15aa62bd5af96273f78d064f5dc7..f5041784f4c3f60551b97a155bb0d2bb3d8dc8a2 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.11.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Mattia Barbon
 // Created:     01.11.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Mattia Barbon

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

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


@@ -20,11 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-

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


@@ -33,6 +28,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"

+#include "wx/thread.h"

 
 #ifdef __VMS__
     #pragma message disable nosimpint
 
 #ifdef __VMS__
     #pragma message disable nosimpint


@@ -103,13 +99,13 @@ bool wxEventLoopImpl::SendIdleMessage()
 
 wxGUIEventLoop::~wxGUIEventLoop()
 {
 
 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 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, wxT("can't reenter a message loop") );

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


@@ -125,15 +121,14 @@ int wxGUIEventLoop::Run()
     OnExit();
 
     int exitcode = m_impl->GetExitCode();
     OnExit();
 
     int exitcode = m_impl->GetExitCode();

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

 
     return exitcode;
 }
 
 void wxGUIEventLoop::Exit(int rc)
 {
 
     return exitcode;
 }
 
 void wxGUIEventLoop::Exit(int rc)
 {

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

 
     m_impl->SetExitCode(rc);
     m_impl->SetKeepGoing( false );
 
     m_impl->SetExitCode(rc);
     m_impl->SetKeepGoing( false );


@@ -141,6 +136,20 @@ void wxGUIEventLoop::Exit(int rc)
     ::wxBreakDispatch();
 }
 
     ::wxBreakDispatch();
 }
 

+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+    m_isInsideYield = true;
+    m_eventsToProcessInsideYield = eventsToProcess;
+
+    while (wxTheApp && wxTheApp->Pending())
+        // TODO: implement event filtering using the eventsToProcess mask
+        wxTheApp->Dispatch();
+
+    m_isInsideYield = false;
+
+    return true;
+}
+

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