NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
int y = r.y;
int x = r.x ;
- if ( parent != NULL && ![ parent isFlipped ] )
+ if ( parent == NULL || ![ parent isFlipped ] )
y = frame.size.height - ( r.y + r.height );
return NSMakeRect(x, y, r.width , r.height);
}
NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
int y = rect.origin.y;
int x = rect.origin.x;
- if ( parent != NULL && ![ parent isFlipped ] )
+ 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 );
}
NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
int x = p.x ;
int y = p.y;
- if ( parent != NULL && ![ parent isFlipped ] )
+ if ( parent == NULL || ![ parent isFlipped ] )
y = frame.size.height - ( p.y );
return NSMakePoint(x, y);
}
NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
int x = p.x;
int y = p.y;
- if ( parent != NULL && ![ parent isFlipped ] )
+ if ( parent == NULL || ![ parent isFlipped ] )
y = 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;
}
- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
- (wxNonOwnedWindowCocoaImpl*) implementation;
-
+- (void)noResponderFor: (SEL) selector;
@end
@implementation wxNSWindow
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);
+ }
+}
@end
-@interface wxNSPanel : wxNSWindow
+@interface wxNSPanel : NSPanel
{
+ wxNonOwnedWindowCocoaImpl* impl;
}
+- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
+- (wxNonOwnedWindowCocoaImpl*) implementation;
+- (void)noResponderFor: (SEL) selector;
@end
@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
- (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;
}
}
-- (void)windowDidBecomeMain:(NSNotification *)notification
+- (void)windowDidBecomeKey:(NSNotification *)notification
{
wxNSWindow* window = (wxNSWindow*) [notification object];
wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
}
}
-- (void)windowDidResignMain:(NSNotification *)notification
+- (void)windowDidResignKey:(NSNotification *)notification
{
wxNSWindow* window = (wxNSWindow*) [notification object];
wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
{
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;
+}
+
@end
IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )
wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
{
+ [m_macWindow setImplementation:nil];
+ [m_macWindow setDelegate:nil];
[m_macWindow release];
}
wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) );
}
-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;
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];
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 ) )
{
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 setDelegate:controller];
- // [m_macWindow makeKeyAndOrderFront:nil];
+ [m_macWindow setAcceptsMouseMovedEvents: YES];
}
{
if ( show )
{
- [m_macWindow orderFront:nil];
+ [m_macWindow makeKeyAndOrderFront:nil];
[[m_macWindow contentView] setNeedsDisplay:YES];
}
else
return true;
}
-bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout)
+bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
{
return Show(show);
}
return true;
}
-bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col )
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) )
{
return true;
}
}
}
-bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle style)
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
{
return true;
}
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
height = 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];
+ left = rect.origin.x;
+ top = rect.origin.y;
width = rect.size.width;
height = rect.size.height;
}
-bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& region)
+bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region))
{
return false;
}
[m_macWindow deminiaturize:nil];
}
-void wxNonOwnedWindowCocoaImpl::Maximize(bool maximize)
+void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
{
[m_macWindow zoom:nil];
}
return m_macFullScreenData != NULL ;
}
-bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style)
+bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
{
if ( show )
{
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;
+ *x = p.x;
if ( y )
*y = p.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 )
wxNonOwnedWindowImpl* now = new wxNonOwnedWindowCocoaImpl( wxpeer );
now->Create( parent, pos, size, style , extraStyle, name );
return now;
-}
\ No newline at end of file
+}
projects / wxWidgets.git / blobdiff