X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..6f96ac03f027df18b5bc3758eb00df951be6db85:/src/msw/evtloop.cpp diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index bf33c7d9e8..6c7e74c00f 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "evtloop.h" #endif @@ -34,17 +34,23 @@ #endif //WX_PRECOMP #include "wx/evtloop.h" + #include "wx/tooltip.h" +#include "wx/except.h" +#include "wx/ptr_scpd.h" #include "wx/msw/private.h" #if wxUSE_THREADS + #include "wx/thread.h" + // define the array of MSG strutures WX_DECLARE_OBJARRAY(MSG, wxMsgArray); - // VS: this is a bit dirty - it duplicates same declaration in app.cpp - // (and there's no WX_DEFINE_OBJARRAY for that reason - it is already - // defined in app.cpp). -#endif + + #include "wx/arrimpl.cpp" + + WX_DEFINE_OBJARRAY(wxMsgArray); +#endif // wxUSE_THREADS // ---------------------------------------------------------------------------- // wxEventLoopImpl @@ -75,6 +81,36 @@ private: int m_exitcode; }; +// ---------------------------------------------------------------------------- +// helper class +// ---------------------------------------------------------------------------- + +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl); + +// this object sets the wxEventLoop given to the ctor as the currently active +// one and unsets it in its dtor +class wxEventLoopActivator +{ +public: + wxEventLoopActivator(wxEventLoop **pActive, + wxEventLoop *evtLoop) + { + m_pActive = pActive; + m_evtLoopOld = *pActive; + *pActive = evtLoop; + } + + ~wxEventLoopActivator() + { + // restore the previously active event loop + *m_pActive = m_evtLoopOld; + } + +private: + wxEventLoop *m_evtLoopOld; + wxEventLoop **m_pActive; +}; + // ============================================================================ // wxEventLoopImpl implementation // ============================================================================ @@ -96,13 +132,29 @@ void wxEventLoopImpl::ProcessMessage(MSG *msg) bool wxEventLoopImpl::PreProcessMessage(MSG *msg) { - HWND hWnd = msg->hwnd; - wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd); + HWND hwnd = msg->hwnd; + wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd); + + // this may happen if the event occured in a standard modeless dialog (the + // only example of which I know of is the find/replace dialog) - then call + // IsDialogMessage() to make TAB navigation in it work + if ( !wndThis ) + { + // we need to find the dialog containing this control as + // IsDialogMessage() just eats all the messages (i.e. returns TRUE for + // them) if we call it for the control itself + while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD ) + { + hwnd = ::GetParent(hwnd); + } + + return hwnd && ::IsDialogMessage(hwnd, msg) != 0; + } #if wxUSE_TOOLTIPS // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to // popup the tooltip bubbles - if ( wndThis && (msg->message == WM_MOUSEMOVE) ) + if ( msg->message == WM_MOUSEMOVE ) { wxToolTip *tt = wndThis->GetToolTip(); if ( tt ) @@ -112,22 +164,39 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg) } #endif // wxUSE_TOOLTIPS - // try translations first; find the youngest window with a translation - // table. + // allow the window to prevent certain messages from being + // translated/processed (this is currently used by wxTextCtrl to always + // grab Ctrl-C/V/X, even if they are also accelerators in some parent) + if ( !wndThis->MSWShouldPreProcessMessage((WXMSG *)msg) ) + { + return FALSE; + } + + // try translations first: the accelerators override everything wxWindow *wnd; + for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { - if ( wnd->MSWTranslateMessage((WXMSG *)msg) ) + if ( wnd->MSWTranslateMessage((WXMSG *)msg)) return TRUE; + + // stop at first top level window, i.e. don't try to process the key + // strokes originating in a dialog using the accelerators of the parent + // frame - this doesn't make much sense + if ( wnd->IsTopLevel() ) + break; } - // Anyone for a non-translation message? Try youngest descendants first. - for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) + // now try the other hooks (kbd navigation is handled here): we start from + // wndThis->GetParent() because wndThis->MSWProcessMessage() was already + // called above + for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() ) { if ( wnd->MSWProcessMessage((WXMSG *)msg) ) return TRUE; } + // no special preprocessing for this message, dispatch it normally return FALSE; } @@ -137,9 +206,7 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg) bool wxEventLoopImpl::SendIdleMessage() { - wxIdleEvent event; - - return wxTheApp->ProcessEvent(event) && event.MoreRequested(); + return wxTheApp->ProcessIdle(); } // ============================================================================ @@ -167,38 +234,42 @@ int wxEventLoop::Run() // event loops are not recursive, you need to create another loop! wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") ); - m_impl = new wxEventLoopImpl; - - wxEventLoop *oldLoop = ms_activeLoop; - ms_activeLoop = this; - - for ( ;; ) + // SendIdleMessage() and Dispatch() below may throw so the code here should + // be exception-safe, hence we must use local objects for all actions we + // should undo + wxEventLoopActivator activate(&ms_activeLoop, this); + wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl); + + // we must ensure that OnExit() is called even if an exception is thrown + // from inside Dispatch() but we must call it from Exit() in normal + // situations because it is supposed to be called synchronously, + // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or + // something similar here) + wxTRY { + for ( ;; ) + { #if wxUSE_THREADS - wxMutexGuiLeaveOrEnter(); + wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS - // generate and process idle events for as long as we don't have - // anything else to do - while ( !Pending() && m_impl->SendIdleMessage() ) - ; + // generate and process idle events for as long as we don't have + // anything else to do + while ( !Pending() && m_impl->SendIdleMessage() ) + ; - // a message came or no more idle processing to do, sit in Dispatch() - // waiting for the next message - if ( !Dispatch() ) - { - // we got WM_QUIT - break; + // a message came or no more idle processing to do, sit in + // Dispatch() waiting for the next message + if ( !Dispatch() ) + { + // we got WM_QUIT + break; + } } } + wxCATCH_ALL( OnExit(); ) - int exitcode = m_impl->GetExitCode(); - delete m_impl; - m_impl = NULL; - - ms_activeLoop = oldLoop; - - return exitcode; + return m_impl->GetExitCode(); } void wxEventLoop::Exit(int rc) @@ -207,6 +278,8 @@ void wxEventLoop::Exit(int rc) m_impl->SetExitCode(rc); + OnExit(); + ::PostQuitMessage(rc); }