Mark a couple of labels for translation.

[wxWidgets.git] / src / cocoa / evtloop.mm

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index abffb75f8885ef669e96469b64723b9aaf57e025..0957eb764b6ddf53fd2d92f1e55ed629a580f8fa 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -11,13 +11,13 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #endif //WX_PRECOMP
 

-#include "wx/evtloop.h"
-

 #import <AppKit/NSApplication.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSRunLoop.h>
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSRunLoop.h>


@@ -33,7 +33,7 @@
 int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
 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);
 
 
     wxEventLoopActivator activate(this);
 


@@ -46,7 +46,7 @@ int wxGUIEventLoop::Run()
 
 void wxGUIEventLoop::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_exitcode = rc;
 
 
     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
 {
     // 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
     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.
      */
         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
 
 #if wxUSE_LOG
     // let the logs be flashed again