#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"
}
//
-// 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
{
- wxNonOwnedWindowCocoaImpl* impl;
}
+- (void) sendEvent:(NSEvent *)event;
- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;
-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
-- (wxNonOwnedWindowCocoaImpl*) implementation;
- (void)noResponderFor: (SEL) selector;
@end
@implementation wxNSWindow
+- (void)sendEvent:(NSEvent *) event
+{
+ 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
return frameRect;
}
-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
-{
- impl = theImplementation;
-}
-
-- (wxNonOwnedWindowCocoaImpl*) implementation
-{
- return impl;
-}
-
- (void)doCommandBySelector:(SEL)selector
{
if (shouldHandleSelector(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
@interface wxNSPanel : NSPanel
-
{
- wxNonOwnedWindowCocoaImpl* impl;
}
-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
-- (wxNonOwnedWindowCocoaImpl*) implementation;
- (void)noResponderFor: (SEL) selector;
+- (void)sendEvent:(NSEvent *)event;
@end
@implementation wxNSPanel
-- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
-{
- impl = theImplementation;
-}
-
- (BOOL)canBecomeKeyWindow
{
return YES;
}
-- (wxNonOwnedWindowCocoaImpl*) implementation
-{
- return impl;
-}
-
- (void)doCommandBySelector:(SEL)selector
{
if (shouldHandleSelector(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
- (BOOL)windowShouldClose:(id)nwindow
{
- wxNSWindow* window = (wxNSWindow*) nwindow;
- wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+ wxNonOwnedWindowCocoaImpl* windowimpl = [(NSWindow*) nwindow WX_implementation];
if ( windowimpl )
{
wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
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( (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();
- (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();
- (void)windowDidMove:(NSNotification *)notification
{
wxNSWindow* window = (wxNSWindow*) [notification object];
- wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+ wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation];
if ( windowimpl )
{
wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
- (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();
- (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();
- (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame
{
- wxNonOwnedWindowCocoaImpl* windowimpl = [(wxNSWindow*)window implementation];
+ wxUnusedVar(newFrame);
+ wxNonOwnedWindowCocoaImpl* windowimpl = [window WX_implementation];
if ( windowimpl )
{
wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
{
if ( !m_wxPeer->IsNativeWindowWrapper() )
{
- [m_macWindow setImplementation:nil];
[m_macWindow setDelegate:nil];
[m_macWindow release];
}
}
}
-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;
NSRect r = wxToNSRect( NULL, wxRect( pos, size) );
- [m_macWindow setImplementation:this];
r = [NSWindow contentRectForFrameRect:r styleMask:windowstyle];
[m_macWindow initWithContentRect:r
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 setOpaque:NO];
[m_macWindow setAlphaValue:1.0];
}
+
+ if ( !(style & wxFRAME_TOOL_WINDOW) )
+ [m_macWindow setHidesOnDeactivate:NO];
}
void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), WXWindow nativeWindow )
projects / wxWidgets.git / blobdiff