/////////////////////////////////////////////////////////////////////////////
-// Name: src/mac/cocoa/nonownedwnd.mm
+// Name: src/osx/cocoa/nonownedwnd.mm
// Purpose: non owned window for cocoa
// Author: DavidStefan Csomor
// Modified by:
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
-
-#if wxOSX_USE_COCOA
-#include <Cocoa/Cocoa.h>
-#else
-#include <UIKit/UIKit.h>
+#ifndef WX_PRECOMP
+ #include "wx/nonownedwnd.h"
+ #include "wx/frame.h"
#endif
-#ifdef __WXMAC__
#include "wx/osx/private.h"
-#endif
-
-#if wxOSX_USE_COCOA
-
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 ] )
+ 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);
}
+//
+// wx native implementation classes
+//
+
+@interface wxNSWindow : NSWindow
+
+{
+ wxNonOwnedWindowCocoaImpl* impl;
+}
+
+- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
+- (wxNonOwnedWindowCocoaImpl*) implementation;
+
+@end
+
+@implementation wxNSWindow
+
+- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
+{
+ impl = theImplementation;
+}
+
+- (wxNonOwnedWindowCocoaImpl*) implementation
+{
+ return impl;
+}
+
+
+@end
+
+@interface wxNSPanel : wxNSWindow
+
+{
+}
+
+@end
+
+@implementation wxNSPanel
+
+@end
+
+
+//
+// controller
+//
+
+@interface wxNonOwnedWindowController : NSObject
+{
+}
+
+- (void)windowDidResize:(NSNotification *)notification;
+- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize;
+- (void)windowDidResignMain:(NSNotification *)notification;
+- (void)windowDidBecomeMain:(NSNotification *)notification;
+- (void)windowDidMove:(NSNotification *)notification;
+- (BOOL)windowShouldClose:(id)window;
+
+@end
+
+@implementation wxNonOwnedWindowController
+
+- (id) init
+{
+ [super init];
+ return self;
+}
+
+- (BOOL)windowShouldClose:(id)nwindow
+{
+ wxNSWindow* window = (wxNSWindow*) nwindow;
+ wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+ if ( windowimpl )
+ {
+ wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
+ if ( wxpeer )
+ wxpeer->Close();
+ }
+ return NO;
+}
+
+- (NSSize)windowWillResize:(NSWindow *)win
+ toSize:(NSSize)proposedFrameSize
+{
+ NSRect frame = [win frame];
+ wxRect wxframe = wxFromNSRect( NULL, frame );
+ wxframe.SetWidth( proposedFrameSize.width );
+ wxframe.SetHeight( proposedFrameSize.height );
+ wxNSWindow* window = (wxNSWindow*) win;
+ wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+ if ( windowimpl )
+ {
+ wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
+ if ( wxpeer )
+ {
+ wxpeer->HandleResizing( 0, &wxframe );
+ NSSize newSize = NSMakeSize(wxframe.GetWidth(), wxframe.GetHeight());
+ return newSize;
+ }
+ }
+
+ return proposedFrameSize;
+}
+
+- (void)windowDidResize:(NSNotification *)notification
+{
+ wxNSWindow* window = (wxNSWindow*) [notification object];
+ wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+ if ( windowimpl )
+ {
+ wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
+ if ( wxpeer )
+ wxpeer->HandleResized(0);
+ }
+}
+
+- (void)windowDidMove:(NSNotification *)notification
+{
+ wxNSWindow* window = (wxNSWindow*) [notification object];
+ wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+ if ( windowimpl )
+ {
+ wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
+ if ( wxpeer )
+ wxpeer->HandleMoved(0);
+ }
+}
+
+- (void)windowDidBecomeMain:(NSNotification *)notification
+{
+ wxNSWindow* window = (wxNSWindow*) [notification object];
+ wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+ if ( windowimpl )
+ {
+ wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
+ if ( wxpeer )
+ wxpeer->HandleActivated(0, true);
+ }
+}
+
+- (void)windowDidResignMain:(NSNotification *)notification
+{
+ wxNSWindow* window = (wxNSWindow*) [notification object];
+ wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+ if ( windowimpl )
+ {
+ wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
+ if ( wxpeer )
+ wxpeer->HandleActivated(0, false);
+ }
+}
+
+@end
+
IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )
wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) :
wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
{
+ [m_macWindow setImplementation:nil];
+ [m_macWindow setDelegate:nil];
[m_macWindow release];
}
void wxNonOwnedWindowCocoaImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name )
{
+ static wxNonOwnedWindowController* controller = NULL;
+
+ if ( !controller )
+ controller =[[wxNonOwnedWindowController alloc] init];
+
+
int windowstyle = NSBorderlessWindowMask;
if ( style & wxFRAME_TOOL_WINDOW )
- m_macWindow = [NSPanel alloc];
+ m_macWindow = [wxNSPanel alloc];
else
- m_macWindow = [NSWindow alloc];
+ m_macWindow = [wxNSWindow alloc];
- CGWindowLevel level = kCGNormalWindowLevelKey;
+ CGWindowLevel level = kCGNormalWindowLevel;
if ( style & wxFRAME_TOOL_WINDOW )
{
NSRect r = wxToNSRect( NULL, wxRect( pos, size) );
+ [m_macWindow setImplementation:this];
+
[m_macWindow initWithContentRect:r
styleMask:windowstyle
backing:NSBackingStoreBuffered
];
[m_macWindow setLevel:level];
+
+ [m_macWindow setDelegate:controller];
+
// [m_macWindow makeKeyAndOrderFront:nil];
}
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
void wxNonOwnedWindowCocoaImpl::RequestUserAttention(int WXUNUSED(flags))
{
}
-#endif
+
+void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y )
+{
+ wxPoint p((x ? *x : 0), (y ? *y : 0) );
+ NSPoint nspt = wxToNSPoint( NULL, p );
+ 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 )
+ *y = p.y;
+}
+
+void wxNonOwnedWindowCocoaImpl::WindowToScreen( int *x, int *y )
+{
+ 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;
+}
+
+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;
+}
projects / wxWidgets.git / blobdiff