updated header file name in source

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

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index e2336ca1b18ca3cfe568ff67499d0d743c1c31c5..565209e5b159ea7764ebca3a5e7942941891f999 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/app.mm
+// Name:        src/cocoa/app.mm

 // Purpose:     wxApp
 // Author:      David Elliott
 // Modified by:
 // Purpose:     wxApp
 // Author:      David Elliott
 // Modified by:


@@ -10,9 +10,10 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/app.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
-    #include "wx/app.h"

     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"


@@ -71,15 +72,18 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
     the queue to ensure this method will return.
     See wxEventLoop::Exit() for more information.
 
     the queue to ensure this method will return.
     See wxEventLoop::Exit() for more information.
 

- Ê ÊRN: We used to use nil as the untilDate in previous versions since nil
-Ê  Êis a shorter and more concise way of specifying an infinite amount of
-ÊÊ Êtime than [NSDate distantPast]. ÊHowever, Apple neglects to mention in
-Ê  Êtheir documentation that nil is not handled correctly in OSX 10.2
-Ê  Ê(and possibly lower) and when the call is reached the system comes to
-Ê  Êa screeching halt, therefore we need to specify [NSDate distantPast]
-Ê  Êexplicitly so that wxCocoa will work correctly in OSX 10.2.
+    This overridden method calls the superclass method with an untilDate
+    parameter that indicates nil should be returned if there are no pending
+    events.  That is, nextEventMatchingMask: should not wait for an event.
+    If nil is returned then idle event processing occurs until the user
+    does not request anymore idle events or until a real event comes through.
+
+    RN: Even though Apple documentation states that nil can be passed in place
+    of [NSDate distantPast] in the untilDate parameter, this causes Jaguar (10.2)
+    to get stuck in some kind of loop deep within nextEventMatchingMask:, thus we
+    need to explicitly pass [NSDate distantPast] instead.

 */
 */

-   
+

 - (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag
 {
     // Get the same events except don't block
 - (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag
 {
     // Get the same events except don't block


@@ -229,11 +233,8 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
 
 {
     m_topWindow = NULL;
 

-#if WXWIN_COMPATIBILITY_2_2
-    m_wantDebugOutput = TRUE;
-#endif

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 #endif // __WXDEBUG__
 
     argc = 0;
 #endif // __WXDEBUG__
 
     argc = 0;


@@ -263,7 +264,7 @@ bool wxApp::OnInitGui()
 {
     wxAutoNSAutoreleasePool pool;
     if(!wxAppBase::OnInitGui())
 {
     wxAutoNSAutoreleasePool pool;
     if(!wxAppBase::OnInitGui())

-        return FALSE;
+        return false;

 
     // Create the app using the sharedApplication method
     m_cocoaApp = [NSApplication sharedApplication];
 
     // Create the app using the sharedApplication method
     m_cocoaApp = [NSApplication sharedApplication];


@@ -276,7 +277,7 @@ bool wxApp::OnInitGui()
     wxMenuBarManager::CreateInstance();
 
     wxDC::CocoaInitializeTextSystem();
     wxMenuBarManager::CreateInstance();
 
     wxDC::CocoaInitializeTextSystem();

-    return TRUE;
+    return true;

 }
 
 bool wxApp::CallOnInit()
 }
 
 bool wxApp::CallOnInit()


@@ -288,9 +289,9 @@ bool wxApp::CallOnInit()
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())
 bool wxApp::OnInit()
 {
     if(!wxAppBase::OnInit())

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxApp::Exit()
 }
 
 void wxApp::Exit()


@@ -359,9 +360,8 @@ void wxApp::WakeUpIdle()
 #ifdef __WXDEBUG__
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
 #ifdef __WXDEBUG__
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {

-    m_isInAssert = TRUE;
+    m_isInAssert = true;

     wxAppBase::OnAssert(file, line, cond, msg);
     wxAppBase::OnAssert(file, line, cond, msg);

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 }
 #endif // __WXDEBUG__
 }
 #endif // __WXDEBUG__

-