From 1df4b19481c1e4fb26b7395933d65e9fa4a506ec Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 28 Dec 2008 14:25:00 +0000 Subject: [PATCH] implement DispatchTimeout() for wxCocoa git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 1 + build/bakefiles/files.bkl | 1 + include/wx/cocoa/evtloop.h | 37 +++++++++++++++++++++++++++++++ include/wx/evtloop.h | 2 ++ src/cocoa/evtloop.mm | 55 ++++++++++++++++++---------------------------- 5 files changed, 62 insertions(+), 34 deletions(-) create mode 100644 include/wx/cocoa/evtloop.h diff --git a/Makefile.in b/Makefile.in index b17bd11..9cb6478 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2489,6 +2489,7 @@ COND_TOOLKIT_COCOA_GUI_HDR = \ wx/cocoa/dialog.h \ wx/cocoa/dirdlg.h \ wx/cocoa/drawer.h \ + wx/cocoa/evtloop.h \ wx/cocoa/filedlg.h \ wx/cocoa/font.h \ wx/cocoa/fontdlg.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 7aa7226..42fd51a 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2682,6 +2682,7 @@ src/osx/iphone/window.mm wx/cocoa/dialog.h wx/cocoa/dirdlg.h wx/cocoa/drawer.h + wx/cocoa/evtloop.h wx/cocoa/filedlg.h wx/cocoa/font.h wx/cocoa/fontdlg.h diff --git a/include/wx/cocoa/evtloop.h b/include/wx/cocoa/evtloop.h new file mode 100644 index 0000000..c3ff21e --- /dev/null +++ b/include/wx/cocoa/evtloop.h @@ -0,0 +1,37 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/cocoa/evtloop.h +// Purpose: declaration of wxGUIEventLoop for wxCocoa +// Author: Vadim Zeitlin +// Created: 2008-12-28 +// RCS-ID: $Id$ +// Copyright: (c) 2008 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_COCOA_EVTLOOP_H_ +#define _WX_COCOA_EVTLOOP_H_ + +// ---------------------------------------------------------------------------- +// wxGUIEventLoop for wxCocoa +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase +{ +public: + wxGUIEventLoop() { m_exitcode = 0; } + + virtual int Run(); + virtual void Exit(int rc = 0); + virtual bool Pending() const; + virtual bool Dispatch(); + virtual int DispatchTimeout(unsigned long timeout); + virtual void WakeUp() { } + +protected: + int m_exitcode; + + DECLARE_NO_COPY_CLASS(wxGUIEventLoop) +}; + +#endif // _WX_COCOA_EVTLOOP_H_ + diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index c0fc1e7..6841c61 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -124,6 +124,8 @@ protected: #include "wx/msw/evtloop.h" #elif defined(__WXMAC__) #include "wx/osx/evtloop.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/evtloop.h" #elif defined(__WXDFB__) #include "wx/dfb/evtloop.h" #elif defined(__WXGTK20__) diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm index c0ffc11..b46b1ff 100644 --- a/src/cocoa/evtloop.mm +++ b/src/cocoa/evtloop.mm @@ -10,6 +10,7 @@ /////////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" @@ -22,25 +23,6 @@ #import // ======================================================================== -// wxEventLoopImpl -// ======================================================================== - -class WXDLLEXPORT wxEventLoopImpl -{ -public: - // ctor - wxEventLoopImpl() { SetExitCode(0); } - - // set/get the exit code - void SetExitCode(int exitcode) { m_exitcode = exitcode; } - int GetExitCode() const { return m_exitcode; } - -private: - // the exit code of the event loop - int m_exitcode; -}; - -// ======================================================================== // wxGUIEventLoop // ======================================================================== @@ -48,11 +30,6 @@ private: // wxGUIEventLoop running and exiting // ---------------------------------------------------------------------------- -wxGUIEventLoop::~wxGUIEventLoop() -{ - wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); -} - int wxGUIEventLoop::Run() { // event loops are not recursive, you need to create another loop! @@ -60,24 +37,18 @@ int wxGUIEventLoop::Run() wxEventLoopActivator activate(this); - m_impl = new wxEventLoopImpl; - [[NSApplication sharedApplication] run]; OnExit(); - int exitcode = m_impl->GetExitCode(); - delete m_impl; - m_impl = NULL; - - return exitcode; + return m_exitcode; } void wxGUIEventLoop::Exit(int rc) { wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") ); - m_impl->SetExitCode(rc); + m_exitcode = rc; NSApplication *cocoaApp = [NSApplication sharedApplication]; wxLogTrace(wxTRACE_COCOA,wxT("wxEventLoop::Exit isRunning=%d"), (int)[cocoaApp isRunning]); @@ -125,8 +96,24 @@ bool wxGUIEventLoop::Dispatch() dequeue: YES]) { [cocoaApp sendEvent: event]; - return true; } - return false; + + return true; +} + +int wxGUIEventLoop::DispatchTimeout(unsigned long timeout) +{ + NSApplication *cocoaApp = [NSApplication sharedApplication]; + NSEvent *event = [cocoaApp + nextEventMatchingMask:NSAnyEventMask + untilDate:[[NSDate alloc] initWithTimeIntervalSinceNow:timeout/1000] + inMode:NSDefaultRunLoopMode + dequeue: YES]; + if ( !event ) + return -1; + + [cocoaApp sendEvent: event]; + + return true; } -- 2.7.4