X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5da125c794df0855f8ad82d35eab68820958efce..cbe067603829728da8852282e895f25b2bccf732:/src/osx/cocoa/nonownedwnd.mm diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index ed05e21089..df2a894952 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -22,19 +22,19 @@ NSRect wxToNSRect( NSView* parent, const wxRect& r ) NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; int y = r.y; int x = r.x ; - if ( parent != NULL && ![ parent isFlipped ] ) - y = frame.size.height - ( r.y + r.height ); + if ( parent == NULL || ![ parent isFlipped ] ) + 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; - 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 ); + int y = (int)rect.origin.y; + int x = (int)rect.origin.x; + if ( parent == NULL || ![ parent isFlipped ] ) + 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 ) @@ -42,38 +42,68 @@ NSPoint wxToNSPoint( NSView* parent, const wxPoint& p ) NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame]; int x = p.x ; int y = p.y; - if ( parent != NULL && ![ parent isFlipped ] ) - y = frame.size.height - ( p.y ); + if ( parent == NULL || ![ parent isFlipped ] ) + 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; - if ( parent != NULL && ![ parent isFlipped ] ) - y = frame.size.height - ( p.y ); + int x = (int)p.x; + int y = (int)p.y; + if ( parent == NULL || ![ parent isFlipped ] ) + 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(keyDown:) + || selector == @selector(keyUp:) + || selector == @selector(scrollPageUp:) + || selector == @selector(scrollPageDown:) + || selector == @selector(scrollToBeginningOfDocument:) + || selector == @selector(scrollToEndOfDocument:)) + return false; + + return true; + +} + // // wx native implementation classes // -@interface wxNSWindow : NSWindow +typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector); +@interface wxNSWindow : NSWindow { wxNonOwnedWindowCocoaImpl* impl; } +- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen; - (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation; - (wxNonOwnedWindowCocoaImpl*) implementation; - +- (void)noResponderFor: (SEL) selector; @end @implementation wxNSWindow +// 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; +} + - (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation { impl = theImplementation; @@ -84,17 +114,79 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ) return impl; } +- (void)doCommandBySelector:(SEL)selector +{ + 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:) && selector != @selector(keyUp:)) + { + [super noResponderFor:selector]; +// wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)]; +// superimpl(self, @selector(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 : wxNSWindow +@interface wxNSPanel : NSPanel { + wxNonOwnedWindowCocoaImpl* impl; } +- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation; +- (wxNonOwnedWindowCocoaImpl*) implementation; +- (void)noResponderFor: (SEL) selector; @end -@implementation wxNSPanel +@implementation wxNSPanel + +- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation +{ + impl = theImplementation; +} + +- (BOOL)canBecomeKeyWindow +{ + return YES; +} + +- (wxNonOwnedWindowCocoaImpl*) implementation +{ + return impl; +} + +- (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:) && selector != @selector(keyUp:)) + { + [super noResponderFor:selector]; +// wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)]; +// superimpl(self, @selector(noResponderFor:), selector); + } +} @end @@ -103,16 +195,17 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ) // 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 @@ -142,8 +235,8 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ) { NSRect frame = [win frame]; wxRect wxframe = wxFromNSRect( NULL, frame ); - wxframe.SetWidth( proposedFrameSize.width ); - wxframe.SetHeight( proposedFrameSize.height ); + wxframe.SetWidth( (int)proposedFrameSize.width ); + wxframe.SetHeight( (int)proposedFrameSize.height ); wxNSWindow* window = (wxNSWindow*) win; wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; if ( windowimpl ) @@ -184,7 +277,7 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ) } } -- (void)windowDidBecomeMain:(NSNotification *)notification +- (void)windowDidBecomeKey:(NSNotification *)notification { wxNSWindow* window = (wxNSWindow*) [notification object]; wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; @@ -196,7 +289,7 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ) } } -- (void)windowDidResignMain:(NSNotification *)notification +- (void)windowDidResignKey:(NSNotification *)notification { wxNSWindow* window = (wxNSWindow*) [notification object]; wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation]; @@ -204,62 +297,109 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ) { 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]; + } + return editor; + } + + return nil; +} + +- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame +{ + wxNonOwnedWindowCocoaImpl* windowimpl = [(wxNSWindow*)window 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]; } -void wxNonOwnedWindowCocoaImpl::Destroy() +void wxNonOwnedWindowCocoaImpl::WillBeDestroyed() { - wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) ); + [m_macWindow setDelegate:nil]; } -void wxNonOwnedWindowCocoaImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, -long style, long extraStyle, const wxString& name ) +void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), const wxPoint& pos, const wxSize& size, +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 = kCGNormalWindowLevelKey; - + + CGWindowLevel level = kCGNormalWindowLevel; + if ( style & wxFRAME_TOOL_WINDOW ) { - if ( ( style & wxSTAY_ON_TOP ) ) - level = kCGUtilityWindowLevel; - else - level = kCGFloatingWindowLevel ; - + windowstyle |= NSUtilityWindowMask; + if ( ( style & wxMINIMIZE_BOX ) || ( style & wxMAXIMIZE_BOX ) || + ( style & wxCLOSE_BOX ) || ( style & wxSYSTEM_MENU ) ) + { + windowstyle |= NSTitledWindowMask ; + } } else if ( ( style & wxPOPUP_WINDOW ) ) { @@ -323,28 +463,28 @@ long style, long extraStyle, const wxString& name ) if ( extraStyle & wxFRAME_EX_METAL) windowstyle |= NSTexturedBackgroundWindowMask; + if ( ( style & wxFRAME_FLOAT_ON_PARENT ) || ( style & wxFRAME_TOOL_WINDOW ) ) + level = kCGFloatingWindowLevel; + if ( ( style & wxSTAY_ON_TOP ) ) level = kCGUtilityWindowLevel; -/* - if ( ( style & wxFRAME_FLOAT_ON_PARENT ) ) - group = GetWindowGroupOfClass(kFloatingWindowClass); - */ - + 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 ]; - + [m_macWindow setLevel:level]; [m_macWindow setDelegate:controller]; - - // [m_macWindow makeKeyAndOrderFront:nil]; + + [m_macWindow setAcceptsMouseMovedEvents: YES]; } @@ -357,27 +497,40 @@ void wxNonOwnedWindowCocoaImpl::Raise() { [m_macWindow orderWindow:NSWindowAbove relativeTo:0]; } - + 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() @@ -391,7 +544,7 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha) return true; } -bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col ) +bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) ) { return true; } @@ -404,20 +557,41 @@ 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]; + } +} + 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; @@ -426,7 +600,8 @@ bool wxNonOwnedWindowCocoaImpl::CanSetTransparent() void wxNonOwnedWindowCocoaImpl::MoveWindow(int x, int y, int width, int height) { NSRect r = wxToNSRect( NULL, wxRect(x,y,width, height) ); - [m_macWindow setFrame:r display:YES]; + // do not trigger refreshes upon invisible and possible partly created objects + [m_macWindow setFrame:r display:GetWXPeer()->IsShownOnScreen()]; } void wxNonOwnedWindowCocoaImpl::GetPosition( int &x, int &y ) const @@ -439,39 +614,56 @@ 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 &right, int &width, int &height ) const +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]; - 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 ) @@ -479,12 +671,12 @@ 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 @@ -498,8 +690,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 ) { @@ -523,23 +715,38 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style) delete data ; m_macFullScreenData = NULL ; } - + 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 ) { wxPoint p((x ? *x : 0), (y ? *y : 0) ); - /* NSPoint nspt = wxToNSPoint( NULL, p ); - - nspt = [[m_macWindow contentView] convertPoint:p toV:nil]; - p = wxFromNSPoint( - */ + nspt = [m_macWindow convertScreenToBase:nspt]; + nspt = [[m_macWindow contentView] convertPoint:nspt fromView:nil]; + p = wxFromNSPoint([m_macWindow contentView], nspt); if ( x ) *x = p.x; if ( y ) @@ -548,20 +755,36 @@ void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y ) void wxNonOwnedWindowCocoaImpl::WindowToScreen( int *x, int *y ) { - wxPoint p( (x ? *x : 0), (y ? *y : 0) ); - /* - p = [m_macWindow convertPoint:p toWindow:nil]; - */ + wxPoint p((x ? *x : 0), (y ? *y : 0) ); + NSPoint nspt = wxToNSPoint( [m_macWindow contentView], p ); + nspt = [[m_macWindow contentView] convertPoint:nspt toView:nil]; + nspt = [m_macWindow convertBaseToScreen:nspt]; + p = wxFromNSPoint( NULL, nspt); if ( x ) *x = p.x; if ( 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]; +} + wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size, long style, long extraStyle, const wxString& name ) { wxNonOwnedWindowImpl* now = new wxNonOwnedWindowCocoaImpl( wxpeer ); now->Create( parent, pos, size, style , extraStyle, name ); return now; -} \ No newline at end of file +}