Disable some wxWebView tests that fail on the buildbot but not locally.

[wxWidgets.git] / src / osx / cocoa / nonownedwnd.mm

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index c44f4eba89f42ff69bf02e5f52b92f7f65d513f7..f95db4d67a86eba8f21fdefe564bdd532b3fb9e0 100644 (file)
--- 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
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,13 +13,27 @@
 #ifndef WX_PRECOMP
     #include "wx/nonownedwnd.h"
     #include "wx/frame.h"
 #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"
 
 #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 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 ] )
     int y = r.y;
     int x = r.x ;
     if ( parent == NULL || ![ parent isFlipped ] )


@@ -29,7 +43,7 @@ NSRect wxToNSRect( NSView* parent, const wxRect& r )
 
 wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
 {
 
 wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
 {

-    NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
+    NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame];

     int y = (int)rect.origin.y;
     int x = (int)rect.origin.x;
     if ( parent == NULL || ![ parent isFlipped ] )
     int y = (int)rect.origin.y;
     int x = (int)rect.origin.x;
     if ( parent == NULL || ![ parent isFlipped ] )


@@ -39,7 +53,7 @@ wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
 
 NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
 {
 
 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 ] )
     int x = p.x ;
     int y = p.y;
     if ( parent == NULL || ![ parent isFlipped ] )


@@ -49,7 +63,7 @@ NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
 
 wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 {
 
 wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 {

-    NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
+    NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame];

     int x = (int)p.x;
     int y = (int)p.y;
     if ( parent == NULL || ![ parent isFlipped ] )
     int x = (int)p.x;
     int y = (int)p.y;
     if ( parent == NULL || ![ parent isFlipped ] )


@@ -65,6 +79,7 @@ bool shouldHandleSelector(SEL selector)
             || selector == @selector(deleteForward:)
             || selector == @selector(insertNewline:)
             || selector == @selector(insertTab:)
             || selector == @selector(deleteForward:)
             || selector == @selector(insertNewline:)
             || selector == @selector(insertTab:)

+            || selector == @selector(insertBacktab:)

             || selector == @selector(keyDown:)
             || selector == @selector(keyUp:)
             || selector == @selector(scrollPageUp:)
             || selector == @selector(keyDown:)
             || selector == @selector(keyUp:)
             || selector == @selector(scrollPageUp:)


@@ -78,31 +93,82 @@ bool shouldHandleSelector(SEL selector)
 }
 
 //
 }
 
 //

-// 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)
+
+- (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
 {
 
 @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)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);
+    }

 }
 
 }
 

-- (wxNonOwnedWindowCocoaImpl*) implementation
+// 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

 {
 {

-    return impl;
+    wxUnusedVar(screen);
+    return frameRect;

 }
 
 - (void)doCommandBySelector:(SEL)selector
 }
 
 - (void)doCommandBySelector:(SEL)selector


@@ -119,29 +185,37 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     if (selector != @selector(keyDown:) && selector != @selector(keyUp:))
     {
         [super noResponderFor: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 : NSPanel
 @end
 
 @interface wxNSPanel : NSPanel

-

 {
 {

-    wxNonOwnedWindowCocoaImpl* impl;

 }
 
 }
 

-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
-- (wxNonOwnedWindowCocoaImpl*) implementation;
+- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;

 - (void)noResponderFor: (SEL) selector;
 - (void)noResponderFor: (SEL) selector;

+- (void)sendEvent:(NSEvent *)event;

 @end
 
 @implementation wxNSPanel
 
 @end
 
 @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];

 }
 
 - (BOOL)canBecomeKeyWindow
 }
 
 - (BOOL)canBecomeKeyWindow


@@ -149,11 +223,6 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     return YES;
 }
 
     return YES;
 }
 

-- (wxNonOwnedWindowCocoaImpl*) implementation
-{
-    return impl;
-}
-

 - (void)doCommandBySelector:(SEL)selector
 {
     if (shouldHandleSelector(selector))
 - (void)doCommandBySelector:(SEL)selector
 {
     if (shouldHandleSelector(selector))


@@ -166,11 +235,15 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     if (selector != @selector(keyDown:) && selector != @selector(keyUp:))
     {
         [super noResponderFor: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);

     }
 }
 
     }
 }
 

+- (void)sendEvent:(NSEvent *) event
+{
+    if ( ![self WX_filterSendEvent: event] )
+        [super sendEvent: event];
+}
+

 @end
 
 
 @end
 
 


@@ -178,7 +251,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 // controller
 //
 
 // controller
 //
 

-@interface wxNonOwnedWindowController : NSObject
+@interface wxNonOwnedWindowController : NSObject wxOSX_10_6_AND_LATER(<NSWindowDelegate>)

 {
 }
 
 {
 }
 


@@ -188,21 +261,96 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 - (void)windowDidBecomeKey:(NSNotification *)notification;
 - (void)windowDidMove:(NSNotification *)notification;
 - (BOOL)windowShouldClose:(id)window;
 - (void)windowDidBecomeKey:(NSNotification *)notification;
 - (void)windowDidMove:(NSNotification *)notification;
 - (BOOL)windowShouldClose:(id)window;

+- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame;

 
 @end
 
 
 @end
 

+extern int wxOSXGetIdFromSelector(SEL action );
+

 @implementation wxNonOwnedWindowController
 
 - (id) init
 {
 @implementation wxNonOwnedWindowController
 
 - (id) init
 {

-    [super init];
+    self = [super init];

     return self;
 }
 
     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
 {
 - (BOOL)windowShouldClose:(id)nwindow
 {

-    wxNSWindow* window = (wxNSWindow*) nwindow;
-    wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+    wxNonOwnedWindowCocoaImpl* windowimpl = [(NSWindow*) nwindow WX_implementation];

     if ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
     if ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();


@@ -212,15 +360,15 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     return NO;
 }
 
     return NO;
 }
 

-- (NSSize)windowWillResize:(NSWindow *)win
+- (NSSize)windowWillResize:(NSWindow *)window

                     toSize:(NSSize)proposedFrameSize
 {
                     toSize:(NSSize)proposedFrameSize
 {

-    NSRect frame = [win frame];
+    NSRect frame = [window frame];

     wxRect wxframe = wxFromNSRect( NULL, frame );
     wxframe.SetWidth( (int)proposedFrameSize.width );
     wxframe.SetHeight( (int)proposedFrameSize.height );
     wxRect wxframe = wxFromNSRect( NULL, frame );
     wxframe.SetWidth( (int)proposedFrameSize.width );
     wxframe.SetHeight( (int)proposedFrameSize.height );

-    wxNSWindow* window = (wxNSWindow*) win;
-    wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+
+    wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation];

     if ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
     if ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();


@@ -237,8 +385,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 - (void)windowDidResize:(NSNotification *)notification
 {
 
 - (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();
     if ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();


@@ -250,7 +398,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 - (void)windowDidMove:(NSNotification *)notification
 {
     wxNSWindow* window = (wxNSWindow*) [notification object];
 - (void)windowDidMove:(NSNotification *)notification
 {
     wxNSWindow* window = (wxNSWindow*) [notification object];

-    wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+    wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation];

     if ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
     if ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();


@@ -261,8 +409,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 - (void)windowDidBecomeKey:(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();
     if ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();


@@ -273,8 +421,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 - (void)windowDidResignKey:(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 ( windowimpl )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();


@@ -304,6 +452,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
             editor = [[wxNSTextFieldEditor alloc] init];
             [editor setFieldEditor:YES];
             [tf setFieldEditor:editor];
             editor = [[wxNSTextFieldEditor alloc] init];
             [editor setFieldEditor:YES];
             [tf setFieldEditor:editor];

+            [editor release];

         }
         return editor;
     }
         }
         return editor;
     }


@@ -311,6 +460,20 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
     return nil;
 }
 
     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 )
 @end
 
 IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )


@@ -330,17 +493,22 @@ wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl()
 
 wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
 {
 
 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* WXUNUSED(parent), const wxPoint& pos, const wxSize& size,
+void wxNonOwnedWindowCocoaImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,

 long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;
 long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;


@@ -440,7 +608,7 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
 
     NSRect r = wxToNSRect( NULL, wxRect( pos, size) );
 
 
     NSRect r = wxToNSRect( NULL, wxRect( pos, size) );
 

-    [m_macWindow setImplementation:this];
+    r = [NSWindow contentRectForFrameRect:r styleMask:windowstyle];

 
     [m_macWindow initWithContentRect:r
         styleMask:windowstyle
 
     [m_macWindow initWithContentRect:r
         styleMask:windowstyle


@@ -448,13 +616,50 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
         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_macWindow setLevel:level];

+    m_macWindowLevel = level;

 
     [m_macWindow setDelegate:controller];
 
     [m_macWindow setAcceptsMouseMovedEvents: YES];
 
     [m_macWindow setDelegate:controller];
 
     [m_macWindow setAcceptsMouseMovedEvents: YES];

+    
+    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
 {
 
 WXWindow wxNonOwnedWindowCocoaImpl::GetWXWindow() const
 {


@@ -463,7 +668,7 @@ WXWindow wxNonOwnedWindowCocoaImpl::GetWXWindow() const
 
 void wxNonOwnedWindowCocoaImpl::Raise()
 {
 
 void wxNonOwnedWindowCocoaImpl::Raise()
 {

-    [m_macWindow orderWindow:NSWindowAbove relativeTo:0];
+    [m_macWindow makeKeyAndOrderFront:nil];

 }
 
 void wxNonOwnedWindowCocoaImpl::Lower()
 }
 
 void wxNonOwnedWindowCocoaImpl::Lower()


@@ -471,17 +676,22 @@ void wxNonOwnedWindowCocoaImpl::Lower()
     [m_macWindow orderWindow:NSWindowBelow relativeTo:0];
 }
 
     [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 )
     {
         wxNonOwnedWindow* wxpeer = GetWXPeer(); 
         if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
 bool wxNonOwnedWindowCocoaImpl::Show(bool show)
 {
     if ( show )
     {
         wxNonOwnedWindow* wxpeer = GetWXPeer(); 
         if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 

-            [m_macWindow makeKeyAndOrderFront:nil]; 
+            [m_macWindow makeKeyAndOrderFront:nil];

         else 
             [m_macWindow orderFront:nil]; 
         else 
             [m_macWindow orderFront:nil]; 

-
-        [[m_macWindow contentView] setNeedsDisplay:YES];
+        [[m_macWindow contentView] setNeedsDisplay: YES];

     }
     else
         [m_macWindow orderOut:nil];
     }
     else
         [m_macWindow orderOut:nil];


@@ -507,8 +717,12 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha)
     return true;
 }
 
     return true;
 }
 

-bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) )
+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;
 }
 
     return true;
 }
 


@@ -529,8 +743,30 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
     }
 }
 
     }
 }
 

-bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
+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;
 }
 
     return true;
 }
 


@@ -562,8 +798,6 @@ void wxNonOwnedWindowCocoaImpl::GetSize( int &width, int &height ) const
 
 void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, 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];
     left = (int)rect.origin.x;
     top = (int)rect.origin.y;
     NSRect rect = [[m_macWindow contentView] frame];
     left = (int)rect.origin.x;
     top = (int)rect.origin.y;


@@ -573,7 +807,10 @@ void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width,
 
 bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(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 )


@@ -583,7 +820,19 @@ void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title, wxFontEncoding
 
 bool wxNonOwnedWindowCocoaImpl::IsMaximized() const
 {
 
 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
 }
 
 bool wxNonOwnedWindowCocoaImpl::IsIconized() const


@@ -609,6 +858,7 @@ void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
 
 typedef struct
 {
 
 typedef struct
 {

+    NSUInteger m_formerStyleMask;

     int m_formerLevel;
     NSRect m_formerFrame;
 } FullScreenData ;
     int m_formerLevel;
     NSRect m_formerFrame;
 } FullScreenData ;


@@ -629,25 +879,74 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
         m_macFullScreenData = data ;
         data->m_formerLevel = [m_macWindow level];
         data->m_formerFrame = [m_macWindow frame];
         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 ;
     }
     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];
         [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 ;
         delete data ;
         m_macFullScreenData = NULL ;

+
+        SetSystemUIMode(kUIModeNormal, 0); 

     }
 
     return true;
 }
 
     }
 
     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 )
 }
 
 void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y )


@@ -676,6 +975,38 @@ void wxNonOwnedWindowCocoaImpl::WindowToScreen( int *x, int *y )
         *y = p.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 )
 {
 wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name )
 {


@@ -683,3 +1014,4 @@ wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWind
     now->Create( parent, pos, size, style , extraStyle, name );
     return now;
 }
     now->Create( parent, pos, size, style , extraStyle, name );
     return now;
 }

+