/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/app.mm
+// Name: src/cocoa/app.mm
// Purpose: wxApp
// Author: David Elliott
// Modified by:
// Created: 2002/11/27
// RCS-ID: $Id$
// Copyright: (c) David Elliott
-// Licence: wxWindows licence
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+
+#include "wx/app.h"
+
#ifndef WX_PRECOMP
- #include "wx/defs.h"
- #include "wx/app.h"
- #include "wx/frame.h"
- #include "wx/dialog.h"
#include "wx/dc.h"
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/module.h"
#endif
-#include "wx/module.h"
-
#include "wx/cocoa/ObjcPose.h"
#include "wx/cocoa/autorelease.h"
#include "wx/cocoa/mbarman.h"
+#include "wx/cocoa/NSApplication.h"
#if wxUSE_WX_RESOURCES
# include "wx/resource.h"
#import <AppKit/NSApplication.h>
#import <Foundation/NSRunLoop.h>
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSThread.h>
#import <AppKit/NSEvent.h>
#import <Foundation/NSString.h>
+#import <Foundation/NSNotification.h>
+#import <AppKit/NSCell.h>
// ========================================================================
// wxPoseAsInitializer
plan on stopping the event loop, it is wise to send an event through
the queue to ensure this method will return.
See wxEventLoop::Exit() for more information.
+
+ 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 *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag];
+ NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast] inMode:mode dequeue:flag];
// If we got one, simply return it
if(event)
return event;
// No events, try doing some idle stuff
- if(sg_needIdle && !wxTheApp->IsInAssert() && ([NSDefaultRunLoopMode isEqualToString:mode] || [NSModalPanelRunLoopMode isEqualToString:mode]))
+ if(sg_needIdle
+#ifdef __WXDEBUG__
+ && !wxTheApp->IsInAssert()
+#endif
+ && ([NSDefaultRunLoopMode isEqualToString:mode] || [NSModalPanelRunLoopMode isEqualToString:mode]))
{
sg_needIdle = false;
- wxLogDebug("Processing idle events");
+ wxLogTrace(wxTRACE_COCOA,wxT("Processing idle events"));
while(wxTheApp->ProcessIdle())
{
// Get the same events except don't block
- NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag];
+ NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast] inMode:mode dequeue:flag];
// If we got one, simply return it
if(event)
return event;
// we didn't get one, do some idle work
- wxLogDebug("Looping idle events");
+ wxLogTrace(wxTRACE_COCOA,wxT("Looping idle events"));
}
// No more idle work requested, block
- wxLogDebug("Finished idle processing");
+ wxLogTrace(wxTRACE_COCOA,wxT("Finished idle processing"));
}
else
- wxLogDebug("Avoiding idle processing sg_needIdle=%d",sg_needIdle);
+ wxLogTrace(wxTRACE_COCOA,wxT("Avoiding idle processing sg_needIdle=%d"),sg_needIdle);
return [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:flag];
}
- (void)sendEvent: (NSEvent*)anEvent
{
- wxLogDebug("SendEvent");
+ wxLogTrace(wxTRACE_COCOA,wxT("SendEvent"));
sg_needIdle = true;
[super sendEvent: anEvent];
}
// ========================================================================
// wxNSApplicationDelegate
// ========================================================================
-@interface wxNSApplicationDelegate : NSObject
-{
-}
-
-// Delegate methods
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
-- (void)applicationWillBecomeActive:(NSNotification *)notification;
-- (void)applicationDidBecomeActive:(NSNotification *)notification;
-- (void)applicationWillResignActive:(NSNotification *)notification;
-- (void)applicationDidResignActive:(NSNotification *)notification;
-@end // interface wxNSApplicationDelegate : NSObject
-
@implementation wxNSApplicationDelegate : NSObject
// NOTE: Terminate means that the event loop does NOT return and thus
-// cleanup code doesn't properly execute. Furthermore, wxWindows has its
+// cleanup code doesn't properly execute. Furthermore, wxWidgets has its
// own exit on frame delete mechanism.
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
{
wxTheApp->CocoaDelegate_applicationDidResignActive();
}
+- (void)controlTintChanged:(NSNotification *)notification
+{
+ wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"));
+}
+
@end // implementation wxNSApplicationDelegate : NSObject
// ========================================================================
if ( argc > 1 )
{
static const wxChar *ARG_PSN = _T("-psn_");
- if ( wxStrncmp(argv[1], ARG_PSN, strlen(ARG_PSN)) == 0 )
+ if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
{
// remove this argument
--argc;
- memmove(argv + 1, argv + 2, argc * sizeof(char *));
+ memmove(argv + 1, argv + 2, argc * sizeof(wxChar *));
}
}
wxMenuBarManager::DestroyInstance();
[m_cocoaApp setDelegate:nil];
+ [[NSNotificationCenter defaultCenter] removeObserver:m_cocoaAppDelegate
+ name:NSControlTintDidChangeNotification object:nil];
[m_cocoaAppDelegate release];
m_cocoaAppDelegate = NULL;
{
m_topWindow = NULL;
-#if WXWIN_COMPATIBILITY_2_2
- m_wantDebugOutput = TRUE;
-#endif
#ifdef __WXDEBUG__
- m_isInAssert = FALSE;
+ m_isInAssert = false;
#endif // __WXDEBUG__
argc = 0;
{
wxAutoNSAutoreleasePool pool;
if(!wxAppBase::OnInitGui())
- return FALSE;
+ return false;
// Create the app using the sharedApplication method
m_cocoaApp = [NSApplication sharedApplication];
m_cocoaAppDelegate = [[wxNSApplicationDelegate alloc] init];
[m_cocoaApp setDelegate:m_cocoaAppDelegate];
+ [[NSNotificationCenter defaultCenter] addObserver:m_cocoaAppDelegate
+ selector:@selector(controlTintChanged:)
+ name:NSControlTintDidChangeNotification object:nil];
wxMenuBarManager::CreateInstance();
wxDC::CocoaInitializeTextSystem();
-// [ m_cocoaApp setDelegate:m_cocoaApp ];
- return TRUE;
+ return true;
}
bool wxApp::CallOnInit()
bool wxApp::OnInit()
{
if(!wxAppBase::OnInit())
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
void wxApp::Exit()
s_inYield = true;
// Run the event loop until it is out of events
- while(NSEvent *event = [GetNSApplication()
+ while(1)
+ {
+ wxAutoNSAutoreleasePool pool;
+ NSEvent *event = [GetNSApplication()
nextEventMatchingMask:NSAnyEventMask
untilDate:[NSDate distantPast]
inMode:NSDefaultRunLoopMode
- dequeue: YES])
- {
+ dequeue: YES];
+ if(!event)
+ break;
[GetNSApplication() sendEvent: event];
}
#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);
- m_isInAssert = FALSE;
+ m_isInAssert = false;
}
#endif // __WXDEBUG__
-
projects / wxWidgets.git / blobdiff