X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0ec7fbb8f0912a21ada37851be35d1e19a3f069..8a31648287be0ef976f133de2786b137f1e98340:/src/osx/cocoa/nonownedwnd.mm?ds=sidebyside diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index aa35ba8d4d..f95db4d67a 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -4,7 +4,7 @@ // Author: DavidStefan Csomor // Modified by: // Created: 2008-06-20 -// RCS-ID: $Id: nonownedwnd.mm 48805 2007-09-19 14:52:25Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,124 +13,237 @@ #ifndef WX_PRECOMP #include "wx/nonownedwnd.h" #include "wx/frame.h" + #include "wx/app.h" + #include "wx/dialog.h" + #include "wx/menuitem.h" + #include "wx/menu.h" #endif #include "wx/osx/private.h" +NSScreen* wxOSXGetMenuScreen() +{ + if ( [NSScreen screens] == nil ) + return [NSScreen mainScreen]; + else + { + return [[NSScreen screens] objectAtIndex:0]; + } +} + NSRect wxToNSRect( NSView* parent, const wxRect& r ) { - NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; + NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame]; int y = r.y; int x = r.x ; if ( parent == NULL || ![ parent isFlipped ] ) - y = frame.size.height - ( r.y + r.height ); + y = (int)(frame.size.height - ( r.y + r.height )); return NSMakeRect(x, y, r.width , r.height); } wxRect wxFromNSRect( NSView* parent, const NSRect& rect ) { - NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; - int y = rect.origin.y; - int x = rect.origin.x; + NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame]; + int y = (int)rect.origin.y; + int x = (int)rect.origin.x; if ( parent == NULL || ![ parent isFlipped ] ) - y = frame.size.height - (rect.origin.y + rect.size.height); - return wxRect( x, y, rect.size.width, rect.size.height ); + y = (int)(frame.size.height - (rect.origin.y + rect.size.height)); + return wxRect( x, y, (int)rect.size.width, (int)rect.size.height ); } NSPoint wxToNSPoint( NSView* parent, const wxPoint& p ) { - NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; + NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame]; int x = p.x ; int y = p.y; if ( parent == NULL || ![ parent isFlipped ] ) - y = frame.size.height - ( p.y ); + y = (int)(frame.size.height - ( p.y )); return NSMakePoint(x, y); } wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ) { - NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; - int x = p.x; - int y = p.y; + NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame]; + int x = (int)p.x; + int y = (int)p.y; if ( parent == NULL || ![ parent isFlipped ] ) - y = frame.size.height - ( p.y ); + y = (int)(frame.size.height - ( p.y )); return wxPoint( x, y); } +bool shouldHandleSelector(SEL selector) +{ + if (selector == @selector(noop:) + || selector == @selector(complete:) + || selector == @selector(deleteBackward:) + || selector == @selector(deleteForward:) + || selector == @selector(insertNewline:) + || selector == @selector(insertTab:) + || selector == @selector(insertBacktab:) + || selector == @selector(keyDown:) + || selector == @selector(keyUp:) + || selector == @selector(scrollPageUp:) + || selector == @selector(scrollPageDown:) + || selector == @selector(scrollToBeginningOfDocument:) + || selector == @selector(scrollToEndOfDocument:)) + return false; + + return true; + +} + // -// wx native implementation classes +// wx category for NSWindow (our own and wrapped instances) // -typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector); +@interface NSWindow (wxNSWindowSupport) -@interface wxNSWindow : NSWindow +- (wxNonOwnedWindowCocoaImpl*) WX_implementation; + +- (bool) WX_filterSendEvent:(NSEvent *) event; + +@end + +@implementation NSWindow (wxNSWindowSupport) + +- (wxNonOwnedWindowCocoaImpl*) WX_implementation +{ + return (wxNonOwnedWindowCocoaImpl*) wxNonOwnedWindowImpl::FindFromWXWindow( self ); +} + +// TODO in cocoa everything during a drag is sent to the NSWindow the mouse down occured, +// this does not conform to the wx behaviour if the window is not captured, so try to resend +// or capture all wx mouse event handling at the tlw as we did for carbon + +- (bool) WX_filterSendEvent:(NSEvent *) event +{ + bool handled = false; + if ( ([event type] >= NSLeftMouseDown) && ([event type] <= NSMouseExited) ) + { + wxWindow* cw = wxWindow::GetCapture(); + if ( cw != NULL ) + { + ((wxWidgetCocoaImpl*)cw->GetPeer())->DoHandleMouseEvent( event); + handled = true; + } + } + return handled; +} +@end +// +// wx native implementation +// + +@interface wxNSWindow : NSWindow { - wxNonOwnedWindowCocoaImpl* impl; } -- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation; -- (wxNonOwnedWindowCocoaImpl*) implementation; +- (void) sendEvent:(NSEvent *)event; +- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen; - (void)noResponderFor: (SEL) selector; @end @implementation wxNSWindow -- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation +- (void)sendEvent:(NSEvent *) event { - impl = theImplementation; + if ( ![self WX_filterSendEvent: event] ) + { + WXEVENTREF formerEvent = wxTheApp == NULL ? NULL : wxTheApp->MacGetCurrentEvent(); + WXEVENTHANDLERCALLREF formerHandler = wxTheApp == NULL ? NULL : wxTheApp->MacGetCurrentEventHandlerCallRef(); + + if (wxTheApp) + wxTheApp->MacSetCurrentEvent(event, NULL); + + [super sendEvent: event]; + + if (wxTheApp) + wxTheApp->MacSetCurrentEvent(formerEvent , formerHandler); + } +} + +// The default implementation always moves the window back onto the screen, +// even when the programmer explicitly wants to hide it. +- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen +{ + wxUnusedVar(screen); + return frameRect; } -- (wxNonOwnedWindowCocoaImpl*) implementation +- (void)doCommandBySelector:(SEL)selector { - return impl; + if (shouldHandleSelector(selector) && + !(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) ) + [super doCommandBySelector:selector]; } + // NB: if we don't do this, all key downs that get handled lead to a NSBeep - (void)noResponderFor: (SEL) selector { - if (selector != @selector(keyDown:)) + if (selector != @selector(keyDown:) && selector != @selector(keyUp:)) { - wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)]; - superimpl(self, @selector(noResponderFor:), selector); + [super noResponderFor:selector]; } } +// We need this for borderless windows, i.e. shaped windows or windows without +// a title bar. For more info, see: +// http://lists.apple.com/archives/cocoa-dev/2008/May/msg02091.html +- (BOOL)canBecomeKeyWindow +{ + return YES; +} + @end @interface wxNSPanel : NSPanel - { - wxNonOwnedWindowCocoaImpl* impl; } -- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation; -- (wxNonOwnedWindowCocoaImpl*) implementation; +- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen; - (void)noResponderFor: (SEL) selector; +- (void)sendEvent:(NSEvent *)event; @end -@implementation wxNSPanel +@implementation wxNSPanel -- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation +- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen { - impl = theImplementation; + wxNonOwnedWindowCocoaImpl* impl = (wxNonOwnedWindowCocoaImpl*) wxNonOwnedWindowImpl::FindFromWXWindow( self ); + if (impl && impl->IsFullScreen()) + return frameRect; + else + return [super constrainFrameRect:frameRect toScreen:screen]; } -- (wxNonOwnedWindowCocoaImpl*) implementation +- (BOOL)canBecomeKeyWindow { - return impl; + return YES; } -// NB: if we don't do this, all key downs that get handled lead to a NSBeep +- (void)doCommandBySelector:(SEL)selector +{ + if (shouldHandleSelector(selector)) + [super doCommandBySelector:selector]; +} + +// NB: if we don't do this, it seems that all events that end here lead to a NSBeep - (void)noResponderFor: (SEL) selector { - if (selector != @selector(keyDown:)) + if (selector != @selector(keyDown:) && selector != @selector(keyUp:)) { - wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)]; - superimpl(self, @selector(noResponderFor:), selector); + [super noResponderFor:selector]; } } +- (void)sendEvent:(NSEvent *) event +{ + if ( ![self WX_filterSendEvent: event] ) + [super sendEvent: event]; +} + @end @@ -138,31 +251,106 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector // controller // -@interface wxNonOwnedWindowController : NSObject +@interface wxNonOwnedWindowController : NSObject wxOSX_10_6_AND_LATER() { } - (void)windowDidResize:(NSNotification *)notification; - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize; -- (void)windowDidResignMain:(NSNotification *)notification; -- (void)windowDidBecomeMain:(NSNotification *)notification; +- (void)windowDidResignKey:(NSNotification *)notification; +- (void)windowDidBecomeKey:(NSNotification *)notification; - (void)windowDidMove:(NSNotification *)notification; - (BOOL)windowShouldClose:(id)window; +- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame; @end +extern int wxOSXGetIdFromSelector(SEL action ); + @implementation wxNonOwnedWindowController - (id) init { - [super init]; + self = [super init]; return self; } +- (BOOL) triggerMenu:(SEL) action +{ + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar(); + if ( mbar ) + { + wxMenu* menu = NULL; + wxMenuItem* menuitem = mbar->FindItem(wxOSXGetIdFromSelector(action), &menu); + if ( menu != NULL && menuitem != NULL) + return menu->HandleCommandProcess(menuitem); + } + return NO; +} + +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem +{ + SEL action = [menuItem action]; + + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar(); + if ( mbar ) + { + wxMenu* menu = NULL; + wxMenuItem* menuitem = mbar->FindItem(wxOSXGetIdFromSelector(action), &menu); + if ( menu != NULL && menuitem != NULL) + { + menu->HandleCommandUpdateStatus(menuitem); + return menuitem->IsEnabled(); + } + } + return YES; +} + +- (void)undo:(id)sender +{ + wxUnusedVar(sender); + [self triggerMenu:_cmd]; +} + +- (void)redo:(id)sender +{ + wxUnusedVar(sender); + [self triggerMenu:_cmd]; +} + +- (void)cut:(id)sender +{ + wxUnusedVar(sender); + [self triggerMenu:_cmd]; +} + +- (void)copy:(id)sender +{ + wxUnusedVar(sender); + [self triggerMenu:_cmd]; +} + +- (void)paste:(id)sender +{ + wxUnusedVar(sender); + [self triggerMenu:_cmd]; +} + +- (void)delete:(id)sender +{ + wxUnusedVar(sender); + [self triggerMenu:_cmd]; +} + +- (void)selectAll:(id)sender +{ + wxUnusedVar(sender); + [self triggerMenu:_cmd]; +} + - (BOOL)windowShouldClose:(id)nwindow { - wxNSWindow* window = (wxNSWindow*) nwindow; - wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + wxNonOwnedWindowCocoaImpl* windowimpl = [(NSWindow*) nwindow WX_implementation]; if ( windowimpl ) { wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); @@ -172,15 +360,15 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector return NO; } -- (NSSize)windowWillResize:(NSWindow *)win +- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize { - NSRect frame = [win frame]; + NSRect frame = [window frame]; wxRect wxframe = wxFromNSRect( NULL, frame ); - wxframe.SetWidth( proposedFrameSize.width ); - wxframe.SetHeight( proposedFrameSize.height ); - wxNSWindow* window = (wxNSWindow*) win; - wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + wxframe.SetWidth( (int)proposedFrameSize.width ); + wxframe.SetHeight( (int)proposedFrameSize.height ); + + wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation]; if ( windowimpl ) { wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); @@ -197,8 +385,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector - (void)windowDidResize:(NSNotification *)notification { - wxNSWindow* window = (wxNSWindow*) [notification object]; - wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + NSWindow* window = (NSWindow*) [notification object]; + wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation]; if ( windowimpl ) { wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); @@ -210,7 +398,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector - (void)windowDidMove:(NSNotification *)notification { wxNSWindow* window = (wxNSWindow*) [notification object]; - wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation]; if ( windowimpl ) { wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); @@ -219,10 +407,10 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector } } -- (void)windowDidBecomeMain:(NSNotification *)notification +- (void)windowDidBecomeKey:(NSNotification *)notification { - wxNSWindow* window = (wxNSWindow*) [notification object]; - wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + NSWindow* window = (NSWindow*) [notification object]; + wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation]; if ( windowimpl ) { wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); @@ -231,65 +419,116 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector } } -- (void)windowDidResignMain:(NSNotification *)notification +- (void)windowDidResignKey:(NSNotification *)notification { - wxNSWindow* window = (wxNSWindow*) [notification object]; - wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; + NSWindow* window = (NSWindow*) [notification object]; + wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation]; if ( windowimpl ) { wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); if ( wxpeer ) + { wxpeer->HandleActivated(0, false); + // Needed for popup window since the firstResponder + // (focus in wx) doesn't change when this + // TLW becomes inactive. + wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId()); + event.SetEventObject(wxpeer); + wxpeer->HandleWindowEvent(event); + } } } +- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject +{ + wxUnusedVar(sender); + + if ([anObject isKindOfClass:[wxNSTextField class]]) + { + wxNSTextField* tf = (wxNSTextField*) anObject; + wxNSTextFieldEditor* editor = [tf fieldEditor]; + if ( editor == nil ) + { + editor = [[wxNSTextFieldEditor alloc] init]; + [editor setFieldEditor:YES]; + [tf setFieldEditor:editor]; + [editor release]; + } + return editor; + } + + return nil; +} + +- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame +{ + wxUnusedVar(newFrame); + wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation]; + if ( windowimpl ) + { + wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer(); + wxMaximizeEvent event(wxpeer->GetId()); + event.SetEventObject(wxpeer); + return !wxpeer->HandleWindowEvent(event); + } + return true; +} + @end IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl ) -wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) : +wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) : wxNonOwnedWindowImpl(nonownedwnd) { m_macWindow = NULL; m_macFullScreenData = NULL; } - -wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl() + +wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl() { m_macWindow = NULL; m_macFullScreenData = NULL; } - + wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl() { - [m_macWindow setImplementation:nil]; - [m_macWindow setDelegate:nil]; - [m_macWindow release]; + if ( !m_wxPeer->IsNativeWindowWrapper() ) + { + [m_macWindow setDelegate:nil]; + [m_macWindow release]; + } } -void wxNonOwnedWindowCocoaImpl::Destroy() +void wxNonOwnedWindowCocoaImpl::WillBeDestroyed() { - wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) ); + if ( !m_wxPeer->IsNativeWindowWrapper() ) + { + [m_macWindow setDelegate:nil]; + } } void wxNonOwnedWindowCocoaImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, -long style, long extraStyle, const wxString& name ) +long style, long extraStyle, const wxString& WXUNUSED(name) ) { static wxNonOwnedWindowController* controller = NULL; - + if ( !controller ) controller =[[wxNonOwnedWindowController alloc] init]; int windowstyle = NSBorderlessWindowMask; - - if ( style & wxFRAME_TOOL_WINDOW ) + + if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) || + GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG ) + { m_macWindow = [wxNSPanel alloc]; + } else m_macWindow = [wxNSWindow alloc]; - + CGWindowLevel level = kCGNormalWindowLevel; - + if ( style & wxFRAME_TOOL_WINDOW ) { windowstyle |= NSUtilityWindowMask; @@ -366,26 +605,61 @@ long style, long extraStyle, const wxString& name ) if ( ( style & wxSTAY_ON_TOP ) ) level = kCGUtilityWindowLevel; - + NSRect r = wxToNSRect( NULL, wxRect( pos, size) ); - - [m_macWindow setImplementation:this]; - + + r = [NSWindow contentRectForFrameRect:r styleMask:windowstyle]; + [m_macWindow initWithContentRect:r styleMask:windowstyle backing:NSBackingStoreBuffered - defer:NO + defer:NO ]; - + + // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need + // to be in kCGUtilityWindowLevel and not kCGFloatingWindowLevel to stay + // above the parent. + wxDialog * const parentDialog = wxDynamicCast(parent, wxDialog); + if (parentDialog && parentDialog->IsModal()) + { + if (level == kCGFloatingWindowLevel) + { + level = kCGUtilityWindowLevel; + } + + // Cocoa's modal loop does not process other windows by default, but + // don't call this on normal window levels so nested modal dialogs will + // still behave modally. + if (level != kCGNormalWindowLevel) + { + if ([m_macWindow isKindOfClass:[NSPanel class]]) + { + [(NSPanel*)m_macWindow setWorksWhenModal:YES]; + } + } + } + [m_macWindow setLevel:level]; + m_macWindowLevel = level; [m_macWindow setDelegate:controller]; - + [m_macWindow setAcceptsMouseMovedEvents: YES]; - // [m_macWindow makeKeyAndOrderFront:nil]; + if ( ( style & wxFRAME_SHAPED) ) + { + [m_macWindow setOpaque:NO]; + [m_macWindow setAlphaValue:1.0]; + } + + if ( !(style & wxFRAME_TOOL_WINDOW) ) + [m_macWindow setHidesOnDeactivate:NO]; } +void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), WXWindow nativeWindow ) +{ + m_macWindow = nativeWindow; +} WXWindow wxNonOwnedWindowCocoaImpl::GetWXWindow() const { @@ -394,29 +668,42 @@ WXWindow wxNonOwnedWindowCocoaImpl::GetWXWindow() const void wxNonOwnedWindowCocoaImpl::Raise() { - [m_macWindow orderWindow:NSWindowAbove relativeTo:0]; + [m_macWindow makeKeyAndOrderFront:nil]; } - + void wxNonOwnedWindowCocoaImpl::Lower() { [m_macWindow orderWindow:NSWindowBelow relativeTo:0]; } +void wxNonOwnedWindowCocoaImpl::ShowWithoutActivating() +{ + [m_macWindow orderFront:nil]; + [[m_macWindow contentView] setNeedsDisplay: YES]; +} + bool wxNonOwnedWindowCocoaImpl::Show(bool show) { if ( show ) { - [m_macWindow orderFront:nil]; - [[m_macWindow contentView] setNeedsDisplay:YES]; + wxNonOwnedWindow* wxpeer = GetWXPeer(); + if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) + [m_macWindow makeKeyAndOrderFront:nil]; + else + [m_macWindow orderFront:nil]; + [[m_macWindow contentView] setNeedsDisplay: YES]; } - else + else [m_macWindow orderOut:nil]; return true; } - -bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout) + +bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, + wxShowEffect effect, + unsigned timeout) { - return Show(show); + return wxWidgetCocoaImpl:: + ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout); } void wxNonOwnedWindowCocoaImpl::Update() @@ -432,6 +719,10 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha) bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col ) { + [m_macWindow setBackgroundColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0) + green:(CGFloat) (col.Green() / 255.0) + blue:(CGFloat) (col.Blue() / 255.0) + alpha:(CGFloat) (col.Alpha() / 255.0)]]; return true; } @@ -443,20 +734,42 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle ) int windowStyle = [ m_macWindow styleMask]; if ( metal && !(windowStyle & NSTexturedBackgroundWindowMask) ) { - wxFAIL_MSG( _T("Metal Style cannot be changed after creation") ); + wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") ); } else if ( !metal && (windowStyle & NSTexturedBackgroundWindowMask ) ) { - wxFAIL_MSG( _T("Metal Style cannot be changed after creation") ); - } + wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") ); + } } } - + +void wxNonOwnedWindowCocoaImpl::SetWindowStyleFlag( long style ) +{ + if (m_macWindow) + { + CGWindowLevel level = kCGNormalWindowLevel; + + if (style & wxSTAY_ON_TOP) + level = kCGUtilityWindowLevel; + else if (( style & wxFRAME_FLOAT_ON_PARENT ) || ( style & wxFRAME_TOOL_WINDOW )) + level = kCGFloatingWindowLevel; + + [m_macWindow setLevel: level]; + m_macWindowLevel = level; + } +} + bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle style) { + if ( style == wxBG_STYLE_TRANSPARENT ) + { + [m_macWindow setOpaque:NO]; + [m_macWindow setBackgroundColor:[NSColor clearColor]]; + } + return true; } - + bool wxNonOwnedWindowCocoaImpl::CanSetTransparent() { return true; @@ -479,41 +792,54 @@ void wxNonOwnedWindowCocoaImpl::GetPosition( int &x, int &y ) const void wxNonOwnedWindowCocoaImpl::GetSize( int &width, int &height ) const { NSRect rect = [m_macWindow frame]; - width = rect.size.width; - height = rect.size.height; + width = (int)rect.size.width; + height = (int)rect.size.height; } void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width, int &height ) const { - NSRect outer = NSMakeRect(100,100,100,100); - NSRect content = [NSWindow contentRectForFrameRect:outer styleMask:[m_macWindow styleMask] ]; NSRect rect = [[m_macWindow contentView] frame]; - left = rect.origin.x; - top = rect.origin.y; - width = rect.size.width; - height = rect.size.height; + left = (int)rect.origin.x; + top = (int)rect.origin.y; + width = (int)rect.size.width; + height = (int)rect.size.height; } - -bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& region) + +bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region)) { - return false; + [m_macWindow setOpaque:NO]; + [m_macWindow setBackgroundColor:[NSColor clearColor]]; + + return true; } -void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title, wxFontEncoding encoding ) +void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title, wxFontEncoding encoding ) { [m_macWindow setTitle:wxCFStringRef( title , encoding ).AsNSString()]; } - + bool wxNonOwnedWindowCocoaImpl::IsMaximized() const { - return [m_macWindow isZoomed]; + if (([m_macWindow styleMask] & NSResizableWindowMask) != 0) + { + return [m_macWindow isZoomed]; + } + else + { + NSRect rectScreen = [[NSScreen mainScreen] visibleFrame]; + NSRect rectWindow = [m_macWindow frame]; + return (rectScreen.origin.x == rectWindow.origin.x && + rectScreen.origin.y == rectWindow.origin.y && + rectScreen.size.width == rectWindow.size.width && + rectScreen.size.height == rectWindow.size.height); + } } - + bool wxNonOwnedWindowCocoaImpl::IsIconized() const { return [m_macWindow isMiniaturized]; } - + void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize ) { if ( iconize ) @@ -521,17 +847,18 @@ void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize ) else [m_macWindow deminiaturize:nil]; } - -void wxNonOwnedWindowCocoaImpl::Maximize(bool maximize) + +void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize)) { [m_macWindow zoom:nil]; } - + // http://cocoadevcentral.com/articles/000028.php typedef struct { + NSUInteger m_formerStyleMask; int m_formerLevel; NSRect m_formerFrame; } FullScreenData ; @@ -540,8 +867,8 @@ bool wxNonOwnedWindowCocoaImpl::IsFullScreen() const { return m_macFullScreenData != NULL ; } - -bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style) + +bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style)) { if ( show ) { @@ -552,25 +879,74 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style) m_macFullScreenData = data ; data->m_formerLevel = [m_macWindow level]; data->m_formerFrame = [m_macWindow frame]; - CGDisplayCapture( kCGDirectMainDisplay ); - [m_macWindow setLevel:CGShieldingWindowLevel()]; - [m_macWindow setFrame:[[NSScreen mainScreen] frame] display:YES]; + data->m_formerStyleMask = [m_macWindow styleMask]; +#if 0 + // CGDisplayCapture( kCGDirectMainDisplay ); + //[m_macWindow setLevel:NSMainMenuWindowLevel+1/*CGShieldingWindowLevel()*/]; +#endif + NSRect screenframe = [[NSScreen mainScreen] frame]; + NSRect frame = NSMakeRect (0, 0, 100, 100); + NSRect contentRect; + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + if ( [ m_macWindow respondsToSelector:@selector(setStyleMask:) ] ) + [m_macWindow setStyleMask:data->m_formerStyleMask & ~ NSResizableWindowMask]; +#endif + + contentRect = [NSWindow contentRectForFrameRect: frame + styleMask: [m_macWindow styleMask]]; + screenframe.origin.y += (frame.origin.y - contentRect.origin.y); + screenframe.size.height += (frame.size.height - contentRect.size.height); + [m_macWindow setFrame:screenframe display:YES]; + + SetSystemUIMode(kUIModeAllHidden, + kUIOptionDisableAppleMenu + /* + | kUIOptionDisableProcessSwitch + | kUIOptionDisableForceQuit + */); } else if ( m_macFullScreenData != NULL ) { FullScreenData *data = (FullScreenData *) m_macFullScreenData ; - CGDisplayRelease( kCGDirectMainDisplay ); - [m_macWindow setLevel:data->m_formerLevel]; +#if 0 + // CGDisplayRelease( kCGDirectMainDisplay ); + // [m_macWindow setLevel:data->m_formerLevel]; +#endif + [m_macWindow setFrame:data->m_formerFrame display:YES]; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + if ( [ m_macWindow respondsToSelector:@selector(setStyleMask:) ] ) + [m_macWindow setStyleMask:data->m_formerStyleMask]; +#endif delete data ; m_macFullScreenData = NULL ; + + SetSystemUIMode(kUIModeNormal, 0); } - + return true; } -void wxNonOwnedWindowCocoaImpl::RequestUserAttention(int WXUNUSED(flags)) +void wxNonOwnedWindowCocoaImpl::RequestUserAttention(int flagsWX) { + NSRequestUserAttentionType flagsOSX; + switch ( flagsWX ) + { + case wxUSER_ATTENTION_INFO: + flagsOSX = NSInformationalRequest; + break; + + case wxUSER_ATTENTION_ERROR: + flagsOSX = NSCriticalRequest; + break; + + default: + wxFAIL_MSG( "invalid RequestUserAttention() flags" ); + return; + } + + [NSApp requestUserAttention:flagsOSX]; } void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y ) @@ -581,7 +957,7 @@ void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y ) nspt = [[m_macWindow contentView] convertPoint:nspt fromView:nil]; p = wxFromNSPoint([m_macWindow contentView], nspt); if ( x ) - *x = p.x; + *x = p.x; if ( y ) *y = p.y; } @@ -599,6 +975,38 @@ void wxNonOwnedWindowCocoaImpl::WindowToScreen( int *x, int *y ) *y = p.y; } +bool wxNonOwnedWindowCocoaImpl::IsActive() +{ + return [m_macWindow isKeyWindow]; +} + +void wxNonOwnedWindowCocoaImpl::SetModified(bool modified) +{ + [m_macWindow setDocumentEdited:modified]; +} + +bool wxNonOwnedWindowCocoaImpl::IsModified() const +{ + return [m_macWindow isDocumentEdited]; +} + +void wxNonOwnedWindowCocoaImpl::RestoreWindowLevel() +{ + if ( [m_macWindow level] != m_macWindowLevel ) + [m_macWindow setLevel:m_macWindowLevel]; +} + +// +// +// + +wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow nativeWindow) +{ + wxNonOwnedWindowCocoaImpl* now = new wxNonOwnedWindowCocoaImpl( wxpeer ); + now->Create( parent, nativeWindow ); + return now; +} + wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size, long style, long extraStyle, const wxString& name ) { @@ -606,3 +1014,4 @@ wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWind now->Create( parent, pos, size, style , extraStyle, name ); return now; } +