Don't close arcs drawn in wxPostScriptDC.

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

diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp
index da4a396c41d8e82ff57e67f05a0807366988301c..6624e1bc4a6f64270bcd2bbc7c48e7bc6af3edcf 100644 (file)
--- a/src/os2/evtloop.cpp
+++ b/src/os2/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     01.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

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

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


@@ -33,7 +33,7 @@
 
 #include "wx/evtloop.h"
 #include "wx/tooltip.h"
 
 #include "wx/evtloop.h"
 #include "wx/tooltip.h"

-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"

 
 #include "wx/os2/private.h"
 #include "wx/os2/private/timer.h"       // for wxTimerProc
 
 #include "wx/os2/private.h"
 #include "wx/os2/private/timer.h"       // for wxTimerProc


@@ -206,7 +206,7 @@ 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()") );

 }
 
 //////////////////////////////////////////////////////////////////////////////
 }
 
 //////////////////////////////////////////////////////////////////////////////


@@ -241,7 +241,7 @@ private:
 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") );

 
     // SendIdleMessage() and Dispatch() below may throw so the code here should
     // be exception-safe, hence we must use local objects for all actions we
 
     // SendIdleMessage() and Dispatch() below may throw so the code here should
     // be exception-safe, hence we must use local objects for all actions we


@@ -285,7 +285,7 @@ int wxGUIEventLoop::Run()
 
 void wxGUIEventLoop::Exit(int rc)
 {
 
 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->SetExitCode(rc);
 


@@ -304,7 +304,7 @@ bool wxGUIEventLoop::Pending() const
 
 bool wxGUIEventLoop::Dispatch()
 {
 
 bool wxGUIEventLoop::Dispatch()
 {

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

 
     QMSG msg;
     BOOL bRc = ::WinGetMsg(vHabmain, &msg, (HWND) NULL, 0, 0);
 
     QMSG msg;
     BOOL bRc = ::WinGetMsg(vHabmain, &msg, (HWND) NULL, 0, 0);


@@ -365,3 +365,53 @@ bool wxGUIEventLoop::Dispatch()
 
     return true;
 }
 
     return true;
 }

+
+//
+// Yield to incoming messages
+//
+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+    HAB vHab = 0;
+    QMSG vMsg;
+
+    //
+    // Disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    //
+    wxLog::Suspend();
+
+    m_isInsideYield = true;
+    m_eventsToProcessInsideYield = eventsToProcess;
+
+    //
+    // We want to go back to the main message loop
+    // if we see a WM_QUIT. (?)
+    //
+    while (::WinPeekMsg(vHab, &vMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && vMsg.msg != WM_QUIT)
+    {
+        // TODO: implement event filtering using the eventsToProcess mask
+
+#if wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+        if (!wxTheApp->Dispatch())
+            break;
+    }
+
+    //
+    // If they are pending events, we must process them.
+    //
+    if (wxTheApp)
+    {
+        wxTheApp->ProcessPendingEvents();
+        wxTheApp->HandleSockets();
+    }
+
+    //
+    // Let the logs be flashed again
+    //
+    wxLog::Resume();
+    m_isInsideYield = false;
+
+    return true;
+} // end of wxYield