Use GetFont not m_font for GetCharHeight

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

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 188343584f6f55d524c06bf6a0247f26dc6d279a..b2fd69ed5093f882481429aac15b0d5d82cdc410 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -77,9 +77,10 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
     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.
 
-    Apple documentation states that nil can be passed in place of
-    [NSDate distantPast] to the untilDate parameter.  However, according
-    to Ryan Norton this crashes on Jaguar (10.2).
+    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
@@ -231,9 +232,6 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
 
-#if WXWIN_COMPATIBILITY_2_2
-    m_wantDebugOutput = TRUE;
-#endif
 #ifdef __WXDEBUG__
     m_isInAssert = FALSE;
 #endif // __WXDEBUG__