X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d60daa8d3d4ff1df00129b679713809f91f6ec5..9ef101cd5548aacc4d921683d185b687cb7a6d35:/src/cocoa/evtloop.mm diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm index abffb75f88..a017688edc 100644 --- a/src/cocoa/evtloop.mm +++ b/src/cocoa/evtloop.mm @@ -1,23 +1,23 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: cocoa/evtloop.mm +// Name: src/cocoa/evtloop.mm // Purpose: implements wxEventLoop for Cocoa // Author: David Elliott // Modified by: // Created: 2003/10/02 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// License: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" +#include "wx/evtloop.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" #endif //WX_PRECOMP -#include "wx/evtloop.h" - #import #import #import @@ -33,7 +33,7 @@ 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); @@ -46,7 +46,7 @@ int wxGUIEventLoop::Run() 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_exitcode = rc; @@ -86,7 +86,7 @@ bool wxGUIEventLoop::Dispatch() { // This check is required by wxGTK but probably not really for wxCocoa // Keep it here to encourage developers to write cross-platform code - wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") ); + wxCHECK_MSG( IsRunning(), false, wxT("can't call Dispatch() if not running") ); NSApplication *cocoaApp = [NSApplication sharedApplication]; // Block to retrieve an event then send it if(NSEvent *event = [cocoaApp @@ -163,7 +163,8 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess) the main thread waits and then notify the main thread by posting an event. */ - ProcessPendingEvents(); + if (wxTheApp) + wxTheApp->ProcessPendingEvents(); #if wxUSE_LOG // let the logs be flashed again