// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id: utils.mm 48805 2007-09-19 14:52:25Z SC $
+// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if wxOSX_USE_COCOA
-#if wxUSE_BASE
+#if wxUSE_GUI
// Emit a beeeeeep
void wxBell()
NSBeep();
}
-// ----------------------------------------------------------------------------
-// Common Event Support
-// ----------------------------------------------------------------------------
-
-void wxMacWakeUp()
-{
- // ensure that we have an auto release pool in place because the event will
- // be autoreleased from NSEvent:otherEventWithType and we might not have a
- // global pool during startup or shutdown and we actually never have it if
- // we're called from another thread
- //
- // FIXME: we can't use wxMacAutoreleasePool here because it's in core and
- // we're in base
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- NSEvent* wakeupEvent = [NSEvent otherEventWithType:NSApplicationDefined
- location:NSZeroPoint
- modifierFlags:NSAnyEventMask
- timestamp:0
- windowNumber:0
- context:nil
- subtype:0
- data1:0
- data2:0];
- [NSApp postEvent:wakeupEvent atStart:NO];
-
- [pool release];
-}
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
-@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)
-{
-}
-
-- (void)applicationWillFinishLaunching:(NSApplication *)sender;
-
-- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
-- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
-- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename;
-- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
- withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
-
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
-- (void)applicationWillTerminate:(NSApplication *)sender;
-@end
-
@implementation wxNSAppController
-- (void)applicationWillFinishLaunching:(NSApplication *)application {
+- (void)applicationWillFinishLaunching:(NSNotification *)application {
wxUnusedVar(application);
-}
+
+ // we must install our handlers later than setting the app delegate, because otherwise our handlers
+ // get overwritten in the meantime
-- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
-{
- wxUnusedVar(sender);
- wxCFStringRef cf(wxCFRetain(filename));
- wxTheApp->MacOpenFile(cf.AsString()) ;
- return YES;
+ NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
+
+ [appleEventManager setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:)
+ forEventClass:kInternetEventClass andEventID:kAEGetURL];
+
+ [appleEventManager setEventHandler:self andSelector:@selector(handleOpenAppEvent:withReplyEvent:)
+ forEventClass:kCoreEventClass andEventID:kAEOpenApplication];
+
}
-- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
+- (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames
{
wxUnusedVar(sender);
- wxTheApp->MacNewFile() ;
- return NO;
+ wxArrayString fileList;
+ size_t i;
+ const size_t count = [fileNames count];
+ for (i = 0; i < count; i++)
+ {
+ fileList.Add( wxCFStringRef::AsStringWithNormalizationFormC([fileNames objectAtIndex:i]) );
+ }
+
+ wxTheApp->MacOpenFiles(fileList);
}
- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
wxTheApp->MacOpenURL(cf.AsString()) ;
}
+- (void)handleOpenAppEvent:(NSAppleEventDescriptor *)event
+ withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+ wxUnusedVar(replyEvent);
+ wxTheApp->MacNewFile() ;
+}
+
/*
Allowable return values are:
NSTerminateNow - it is ok to proceed with termination
return NSTerminateNow;
}
-- (void)applicationWillTerminate:(NSApplication *)application {
+- (void)applicationWillTerminate:(NSNotification *)application {
wxUnusedVar(application);
wxCloseEvent event;
event.SetCanVeto(false);
return NO;
}
+- (void)applicationDidBecomeActive:(NSNotification *)notification
+{
+ wxUnusedVar(notification);
+
+ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
+ end = wxTopLevelWindows.end();
+ i != end;
+ ++i )
+ {
+ wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
+ wxNonOwnedWindowImpl* winimpl = win ? win->GetNonOwnedPeer() : NULL;
+ WXWindow nswindow = win ? win->GetWXWindow() : nil;
+
+ if ( nswindow && [nswindow hidesOnDeactivate] == NO && winimpl)
+ winimpl->RestoreWindowLevel();
+ }
+ if ( wxTheApp )
+ wxTheApp->SetActive( true , NULL ) ;
+}
+
+- (void)applicationWillResignActive:(NSNotification *)notification
+{
+ wxUnusedVar(notification);
+ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
+ end = wxTopLevelWindows.end();
+ i != end;
+ ++i )
+ {
+ wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
+ WXWindow nswindow = win ? win->GetWXWindow() : nil;
+
+ if ( nswindow && [nswindow level] == kCGFloatingWindowLevel && [nswindow hidesOnDeactivate] == NO )
+ [nswindow setLevel:kCGNormalWindowLevel];
+ }
+}
+
+- (void)applicationDidResignActive:(NSNotification *)notification
+{
+ wxUnusedVar(notification);
+ if ( wxTheApp )
+ wxTheApp->SetActive( false , NULL ) ;
+}
+
@end
/*
@implementation ModalDialogDelegate
- (id)init
{
- [super init];
+ self = [super init];
sheetFinished = NO;
resultCode = -1;
impl = 0;
}
@end
+// here we subclass NSApplication, for the purpose of being able to override sendEvent.
+@interface wxNSApplication : NSApplication
+{
+}
+
+- (void)sendEvent:(NSEvent *)anEvent;
+
+@end
+
+@implementation wxNSApplication
+
+/* This is needed because otherwise we don't receive any key-up events for command-key
+ combinations (an AppKit bug, apparently) */
+- (void)sendEvent:(NSEvent *)anEvent
+{
+ if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask))
+ [[self keyWindow] sendEvent:anEvent];
+ else [super sendEvent:anEvent];
+}
+
+@end
+
+WX_NSObject appcontroller = nil;
+
+NSLayoutManager* gNSLayoutManager = nil;
+
+WX_NSObject wxApp::OSXCreateAppController()
+{
+ return [[wxNSAppController alloc] init];
+}
+
bool wxApp::DoInitGui()
{
wxMacAutoreleasePool pool;
- [NSApplication sharedApplication];
if (!sm_isEmbedded)
{
- wxNSAppController* controller = [[wxNSAppController alloc] init];
- [[NSApplication sharedApplication] setDelegate:controller];
+ [wxNSApplication sharedApplication];
+
+ appcontroller = OSXCreateAppController();
+ [NSApp setDelegate:appcontroller];
- NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
- [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
- forEventClass:kInternetEventClass andEventID:kAEGetURL];
+ // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads
+ // to the duplication of menus under 10.5 and a warning under 10.6
+#if 0
+ [NSApp finishLaunching];
+#endif
}
+ gNSLayoutManager = [[NSLayoutManager alloc] init];
+
return true;
}
void wxApp::DoCleanUp()
{
+ if ( appcontroller != nil )
+ {
+ [NSApp setDelegate:nil];
+ [appcontroller release];
+ appcontroller = nil;
+ }
+ if ( gNSLayoutManager != nil )
+ {
+ [gNSLayoutManager release];
+ gNSLayoutManager = nil;
+ }
}
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{
- NSRect displayRect = [[NSScreen mainScreen] visibleFrame];
+ NSRect displayRect = [wxOSXGetMenuScreen() visibleFrame];
wxRect r = wxFromNSRect( NULL, displayRect );
if ( x )
*x = r.x;
ms.SetMiddleDown( (buttons & 0x04) != 0 );
ms.SetRightDown( (buttons & 0x02) != 0 );
- ms.SetControlDown(modifiers & NSControlKeyMask);
+ ms.SetRawControlDown(modifiers & NSControlKeyMask);
ms.SetShiftDown(modifiers & NSShiftKeyMask);
ms.SetAltDown(modifiers & NSAlternateKeyMask);
- ms.SetMetaDown(modifiers & NSCommandKeyMask);
+ ms.SetControlDown(modifiers & NSCommandKeyMask);
return ms;
}
{
if (gs_wxBusyCursorCount++ == 0)
{
+ NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator];
+ id object;
+
+ while ((object = [enumerator nextObject])) {
+ [(NSWindow*) object disableCursorRects];
+ }
+
gMacStoredActiveCursor = gMacCurrentCursor;
cursor->MacInstall();
if (--gs_wxBusyCursorCount == 0)
{
- gMacStoredActiveCursor.MacInstall();
- gMacStoredActiveCursor = wxNullCursor;
+ NSEnumerator *enumerator = [[[NSApplication sharedApplication] windows] objectEnumerator];
+ id object;
+
+ while ((object = [enumerator nextObject])) {
+ [(NSWindow*) object enableCursorRects];
+ }
wxSetCursor(wxNullCursor);
+
+ gMacStoredActiveCursor.MacInstall();
+ gMacStoredActiveCursor = wxNullCursor;
}
}
wxSize sz = m_window->GetSize();
- int left = subrect != NULL ? subrect->x : 0 ;
- int top = subrect != NULL ? subrect->y : 0 ;
int width = subrect != NULL ? subrect->width : sz.x;
int height = subrect != NULL ? subrect->height : sz.y ;
- NSRect rect = NSMakeRect(left, top, width, height );
- NSView* view = (NSView*) m_window->GetHandle();
- [view lockFocus];
- // we use this method as other methods force a repaint, and this method can be
- // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
- NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
- [view unlockFocus];
-
wxBitmap bitmap(width, height);
- if ( [rep respondsToSelector:@selector(CGImage)] )
- {
- CGImageRef cgImageRef = (CGImageRef)[rep CGImage];
- CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) );
- // since our context is upside down we dont use CGContextDrawImage
- wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ;
- CGImageRelease(cgImageRef);
- cgImageRef = NULL;
- }
- else
+ NSView* view = (NSView*) m_window->GetHandle();
+ if ( [view isHiddenOrHasHiddenAncestor] == NO )
{
- // TODO for 10.4 in case we can support this for osx_cocoa
+ [view lockFocus];
+ // we use this method as other methods force a repaint, and this method can be
+ // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
+ NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]];
+ [view unlockFocus];
+ if ( [rep respondsToSelector:@selector(CGImage)] )
+ {
+ CGImageRef cgImageRef = (CGImageRef)[rep CGImage];
+
+ CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef) , CGImageGetHeight(cgImageRef) );
+ // since our context is upside down we dont use CGContextDrawImage
+ wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ;
+ }
+ else
+ {
+ // TODO for 10.4 in case we can support this for osx_cocoa
+ }
+ [rep release];
}
- [rep release];
return bitmap;
}
projects / wxWidgets.git / blobdiff