Fix wxOSX wxTextCtrl refactoring of r65129.

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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 10098f74f53f32471c798f445e7929b508cd60dc..35e755322965b1080d4b9b1e0a3d378192df575c 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -13,6 +13,8 @@
 #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"

 #endif
 
 #include "wx/osx/private.h"
 #endif
 
 #include "wx/osx/private.h"


@@ -78,39 +80,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) sendEvent:(NSEvent *)event;

 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;

-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
-- (wxNonOwnedWindowCocoaImpl*) implementation;

 - (void)noResponderFor: (SEL) selector;
 @end
 
 @implementation wxNSWindow
 
 - (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
+- (void)sendEvent:(NSEvent *) event

 {
 {

-    return frameRect;
-}
+    if ( ![self WX_filterSendEvent: event] )
+    {
+        WXEVENTREF formerEvent = wxTheApp == NULL ? NULL : wxTheApp->MacGetCurrentEvent();
+        WXEVENTHANDLERCALLREF formerHandler = wxTheApp == NULL ? NULL : wxTheApp->MacGetCurrentEventHandlerCallRef();

 
 

-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
-{
-    impl = theImplementation;
+        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


@@ -127,8 +172,6 @@ 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);

     }
 }
 
     }
 }
 


@@ -143,33 +186,20 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 @end
 
 @interface wxNSPanel : NSPanel
 @end
 
 @interface wxNSPanel : NSPanel

-

 {
 {

-    wxNonOwnedWindowCocoaImpl* impl;

 }
 
 }
 

-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
-- (wxNonOwnedWindowCocoaImpl*) implementation;

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

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

 @end
 
 @implementation wxNSPanel
 
 @end
 
 @implementation wxNSPanel
 

-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
-{
-    impl = theImplementation;
-}
-

 - (BOOL)canBecomeKeyWindow
 {
     return YES;
 }
 
 - (BOOL)canBecomeKeyWindow
 {
     return YES;
 }
 

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

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


@@ -182,11 +212,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
 
 


@@ -194,7 +228,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>)

 {
 }
 
 {
 }
 


@@ -204,6 +238,7 @@ 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
 


@@ -217,8 +252,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 - (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();


@@ -228,15 +262,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();


@@ -253,8 +287,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();


@@ -266,7 +300,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();


@@ -277,8 +311,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();


@@ -289,8 +323,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();


@@ -327,6 +361,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 )


@@ -346,17 +394,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;


@@ -456,7 +509,6 @@ 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
     r = [NSWindow contentRectForFrameRect:r styleMask:windowstyle];
 
     [m_macWindow initWithContentRect:r


@@ -465,13 +517,49 @@ 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 setDelegate:controller];
 
     [m_macWindow setAcceptsMouseMovedEvents: YES];
     [m_macWindow setLevel:level];
 
     [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
 {


@@ -629,7 +717,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


@@ -692,8 +792,25 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
     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 )


@@ -732,11 +849,18 @@ void wxNonOwnedWindowCocoaImpl::SetModified(bool modified)
     [m_macWindow setDocumentEdited:modified];
 }
 
     [m_macWindow setDocumentEdited:modified];
 }
 

-bool wxNonOwnedWindowCocoaImpl::GetModified() const
+bool wxNonOwnedWindowCocoaImpl::IsModified() const

 {
     return [m_macWindow isDocumentEdited];
 }
 
 {
     return [m_macWindow isDocumentEdited];
 }
 

+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 )
 {