X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdccdfabb29bd51aded9aac141e1f7bbd6c85443..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/motif/evtloop.cpp diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp index 4271f4577c..f5041784f4 100644 --- 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 -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __VMS -#define XtParent XTPARENT -#define XtDisplay XTDISPLAY -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,22 +24,28 @@ #include "wx/event.h" #include "wx/app.h" #include "wx/window.h" + #include "wx/module.h" #endif //WX_PRECOMP #include "wx/evtloop.h" +#include "wx/thread.h" #ifdef __VMS__ -#pragma message disable nosimpint + #pragma message disable nosimpint #endif #include #include #ifdef __VMS__ -#pragma message enable nosimpint + #pragma message enable nosimpint #endif #include "wx/unix/private.h" #include "wx/motif/private.h" +#ifdef HAVE_SYS_SELECT_H +# include +#endif + static bool CheckForKeyUp(XEvent* event); static bool CheckForKeyDown(XEvent* event); static bool CheckForAccelerator(XEvent* event); @@ -96,15 +97,15 @@ bool wxEventLoopImpl::SendIdleMessage() // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop::~wxEventLoop() +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 wxEventLoop::Run() +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); @@ -117,16 +118,17 @@ int wxEventLoop::Run() break; } + OnExit(); + int exitcode = m_impl->GetExitCode(); - delete m_impl; - m_impl = NULL; + wxDELETE(m_impl); return exitcode; } -void wxEventLoop::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->SetKeepGoing( false ); @@ -134,16 +136,30 @@ void wxEventLoop::Exit(int rc) ::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 // ---------------------------------------------------------------------------- -bool wxEventLoop::Pending() const +bool wxGUIEventLoop::Pending() const { return XtAppPending( (XtAppContext)wxTheApp->GetAppContext() ) != 0; } -bool wxEventLoop::Dispatch() +bool wxGUIEventLoop::Dispatch() { XEvent event; XtAppContext context = (XtAppContext)wxTheApp->GetAppContext(); @@ -295,7 +311,7 @@ bool CheckForKeyDown(XEvent* event) wxKeyEvent keyEvent(wxEVT_KEY_DOWN); wxTranslateKeyEvent(keyEvent, win, (Widget) 0, event); - return win->GetEventHandler()->ProcessEvent( keyEvent ); + return win->HandleWindowEvent( keyEvent ); } return false; @@ -321,7 +337,7 @@ bool CheckForKeyUp(XEvent* event) wxKeyEvent keyEvent(wxEVT_KEY_UP); wxTranslateKeyEvent(keyEvent, win, (Widget) 0, event); - return win->GetEventHandler()->ProcessEvent( keyEvent ); + return win->HandleWindowEvent( keyEvent ); } return false; @@ -331,7 +347,7 @@ bool CheckForKeyUp(XEvent* event) // executes one main loop iteration (declared in include/wx/motif/private.h) // ---------------------------------------------------------------------------- -bool wxDoEventLoopIteration( wxEventLoop& evtLoop ) +bool wxDoEventLoopIteration( wxGUIEventLoop& evtLoop ) { bool moreRequested, pendingEvents; @@ -373,8 +389,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop ) // also wxEventLoop::Exit is implemented that way, so that exiting an // event loop won't require an event being in the queue -#include "wx/module.h" - #include #include #include