// 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
/////////////////////////////////////////////////////////////////////////////
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);
}
-- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
+- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename
{
wxUnusedVar(sender);
wxCFStringRef cf(wxCFRetain(filename));
return YES;
}
-- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
+- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
{
wxUnusedVar(sender);
wxTheApp->MacNewFile() ;
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
/*
if (!sm_isEmbedded)
{
wxNSAppController* controller = [[wxNSAppController alloc] init];
- [[NSApplication sharedApplication] setDelegate:controller];
+ [NSApp setDelegate:controller];
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
}
return true;
}
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;
{
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]] retain];
+ [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 ) ;
+ CGImageRelease(cgImageRef);
+ cgImageRef = NULL;
+ }
+ else
+ {
+ // TODO for 10.4 in case we can support this for osx_cocoa
+ }
+ [rep release];
}
- [rep release];
return bitmap;
}
projects / wxWidgets.git / blobdiff