X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b293b4d364670c85ad73132e7a9204912807f49f..404b319a85dadd7decf7a5a5331020520031a41c:/src/msw/evtloop.cpp?ds=sidebyside diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index 0b6bf66a1a..eb97f85bab 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/evtloop.cpp -// Purpose: implements wxEventLoop for MSW +// Name: src/msw/evtloop.cpp +// Purpose: implements wxEventLoop for wxMSW port // Author: Vadim Zeitlin // Modified by: // Created: 01.06.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -27,9 +27,7 @@ #include "wx/evtloop.h" #ifndef WX_PRECOMP - #if wxUSE_GUI - #include "wx/window.h" - #endif + #include "wx/window.h" #include "wx/app.h" #include "wx/log.h" #endif //WX_PRECOMP @@ -39,115 +37,15 @@ #include "wx/msw/private.h" #include "wx/scopeguard.h" -#if wxUSE_GUI - #include "wx/tooltip.h" - #if wxUSE_THREADS - // define the list of MSG strutures - WX_DECLARE_LIST(MSG, wxMsgList); - - #include "wx/listimpl.cpp" - - WX_DEFINE_LIST(wxMsgList) - #endif // wxUSE_THREADS -#endif //wxUSE_GUI - -#if wxUSE_BASE - -// ============================================================================ -// wxMSWEventLoopBase implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// ctor/dtor -// ---------------------------------------------------------------------------- - -wxMSWEventLoopBase::wxMSWEventLoopBase() -{ - m_shouldExit = false; - m_exitcode = 0; -} - -// ---------------------------------------------------------------------------- -// wxEventLoop message processing dispatching -// ---------------------------------------------------------------------------- - -bool wxMSWEventLoopBase::Pending() const -{ - MSG msg; - return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0; -} - -bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg) -{ - const BOOL rc = ::GetMessage(msg, NULL, 0, 0); - - if ( rc == 0 ) - { - // got WM_QUIT - return false; - } - - if ( rc == -1 ) - { - // should never happen, but let's test for it nevertheless - wxLogLastError(wxT("GetMessage")); - - // still break from the loop - return false; - } - - return true; -} - -int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout) -{ - // MsgWaitForMultipleObjects() won't notice any input which was already - // examined (e.g. using PeekMessage()) but not yet removed from the queue - // so we need to remove any immediately messages manually - // - // NB: using MsgWaitForMultipleObjectsEx() could simplify the code here but - // it is not available in very old Windows versions - if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) ) - { - // we use this function just in order to not block longer than the - // given timeout, so we don't pass any handles to it at all - DWORD rc = ::MsgWaitForMultipleObjects - ( - 0, NULL, - FALSE, - timeout, - QS_ALLINPUT - ); - - switch ( rc ) - { - default: - wxLogDebug("unexpected MsgWaitForMultipleObjects() return " - "value %lu", rc); - // fall through - - case WAIT_TIMEOUT: - return -1; - - case WAIT_OBJECT_0: - if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) ) - { - // somehow it may happen that MsgWaitForMultipleObjects() - // returns true but there are no messages -- just treat it - // the same as timeout then - return -1; - } - break; - } - } - - return msg->message != WM_QUIT; -} - +#include "wx/tooltip.h" +#if wxUSE_THREADS + // define the list of MSG strutures + WX_DECLARE_LIST(MSG, wxMsgList); -#endif // wxUSE_BASE + #include "wx/listimpl.cpp" -#if wxUSE_GUI + WX_DEFINE_LIST(wxMsgList) +#endif // wxUSE_THREADS // ============================================================================ // GUI wxEventLoop implementation @@ -401,7 +299,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess) if ((eventsToProcess & wxEVT_CATEGORY_UI) == 0) { // this msg is not going to be dispatched... - // however WM_PAINT is special: until there are damaged + // however WM_PAINT is special: until there are damaged // windows, Windows will keep sending it forever! if (nPaintsReceived > 10) { @@ -426,13 +324,13 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess) } // choose a wxEventCategory for this Windows message - wxEventCategory cat; + bool processNow; switch (msg.message) { #if !defined(__WXWINCE__) - case WM_NCMOUSEMOVE: + case WM_NCMOUSEMOVE: - case WM_NCLBUTTONDOWN: + case WM_NCLBUTTONDOWN: case WM_NCLBUTTONUP: case WM_NCLBUTTONDBLCLK: case WM_NCRBUTTONDOWN: @@ -495,11 +393,11 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess) case WM_MBUTTONUP: case WM_MBUTTONDBLCLK: case WM_MOUSEWHEEL: - cat = wxEVT_CATEGORY_USER_INPUT; + processNow = (eventsToProcess & wxEVT_CATEGORY_USER_INPUT) != 0; break; case WM_TIMER: - cat = wxEVT_CATEGORY_TIMER; + processNow = (eventsToProcess & wxEVT_CATEGORY_TIMER) != 0; break; default: @@ -509,14 +407,22 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess) // by the system. // there are too many of these types of messages to handle // them in this switch - cat = wxEVT_CATEGORY_UI; + processNow = (eventsToProcess & wxEVT_CATEGORY_UI) != 0; } else - cat = wxEVT_CATEGORY_UNKNOWN; + { + // Process all the unknown messages. We must do it because + // failure to process some of them can be fatal, e.g. if we + // don't dispatch WM_APP+2 then embedded IE ActiveX + // controls don't work any more, see #14027. And there may + // be more examples like this, so dispatch all unknown + // messages immediately to be safe. + processNow = true; + } } // should we process this event now? - if (cat & eventsToProcess) + if ( processNow ) { if ( !wxTheApp->Dispatch() ) break; @@ -545,52 +451,3 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess) return true; } - - -#else // !wxUSE_GUI - - -// ============================================================================ -// wxConsoleEventLoop implementation -// ============================================================================ - -#if wxUSE_CONSOLE_EVENTLOOP - -void wxConsoleEventLoop::WakeUp() -{ -#if wxUSE_THREADS - wxWakeUpMainThread(); -#endif -} - -void wxConsoleEventLoop::ProcessMessage(WXMSG *msg) -{ - ::DispatchMessage(msg); -} - -bool wxConsoleEventLoop::Dispatch() -{ - MSG msg; - if ( !GetNextMessage(&msg) ) - return false; - - ProcessMessage(&msg); - - return !m_shouldExit; -} - -int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout) -{ - MSG msg; - int rc = GetNextMessageTimeout(&msg, timeout); - if ( rc != 1 ) - return rc; - - ProcessMessage(&msg); - - return !m_shouldExit; -} - -#endif // wxUSE_CONSOLE_EVENTLOOP - -#endif //wxUSE_GUI