X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bac6f2348d41e91d92baa2a35c19d35097547003..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/cocoa/window.mm diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 9adb78257a..417301f392 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -6,15 +6,237 @@ // Created: 2002/12/26 // RCS-ID: $Id: // Copyright: (c) 2002 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/window.h" -#include "wx/log.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/tooltip.h" + #include "wx/window.h" +#endif //WX_PRECOMP -#import +#include "wx/cocoa/autorelease.h" +#include "wx/cocoa/string.h" + +#import #import +#import +#import +#import +#import + +#include + +// Turn this on to paint green over the dummy views for debugging +#undef WXCOCOA_FILL_DUMMY_VIEW + +#ifdef WXCOCOA_FILL_DUMMY_VIEW +#import +#endif //def WXCOCOA_FILL_DUMMY_VIEW + +// A category for methods that are only present in Panther's SDK +@interface NSView(wxNSViewPrePantherCompatibility) +- (void)getRectsBeingDrawn:(const NSRect **)rects count:(int *)count; +@end + +// ======================================================================== +// wxWindowCocoaHider +// ======================================================================== +class wxWindowCocoaHider: protected wxCocoaNSView +{ + DECLARE_NO_COPY_CLASS(wxWindowCocoaHider) +public: + wxWindowCocoaHider(wxWindow *owner); + virtual ~wxWindowCocoaHider(); + inline WX_NSView GetNSView() { return m_dummyNSView; } +protected: + wxWindowCocoa *m_owner; + WX_NSView m_dummyNSView; + virtual void Cocoa_FrameChanged(void); +#ifdef WXCOCOA_FILL_DUMMY_VIEW + virtual bool Cocoa_drawRect(const NSRect& rect); +#endif //def WXCOCOA_FILL_DUMMY_VIEW +private: + wxWindowCocoaHider(); +}; + +// ======================================================================== +// wxWindowCocoaScroller +// ======================================================================== +class wxWindowCocoaScroller: protected wxCocoaNSView +{ + DECLARE_NO_COPY_CLASS(wxWindowCocoaScroller) +public: + wxWindowCocoaScroller(wxWindow *owner); + virtual ~wxWindowCocoaScroller(); + inline WX_NSScrollView GetNSScrollView() { return m_cocoaNSScrollView; } + void ClientSizeToSize(int &width, int &height); + void DoGetClientSize(int *x, int *y) const; + void Encapsulate(); + void Unencapsulate(); +protected: + wxWindowCocoa *m_owner; + WX_NSScrollView m_cocoaNSScrollView; + virtual void Cocoa_FrameChanged(void); +private: + wxWindowCocoaScroller(); +}; + +// ======================================================================== +// wxDummyNSView +// ======================================================================== +@interface wxDummyNSView : NSView +- (NSView *)hitTest:(NSPoint)aPoint; +@end + +@implementation wxDummyNSView : NSView +- (NSView *)hitTest:(NSPoint)aPoint +{ + return nil; +} + +@end + +// ======================================================================== +// wxWindowCocoaHider +// ======================================================================== +wxWindowCocoaHider::wxWindowCocoaHider(wxWindow *owner) +: m_owner(owner) +{ + wxASSERT(owner); + wxASSERT(owner->GetNSViewForHiding()); + m_dummyNSView = [[wxDummyNSView alloc] + initWithFrame:[owner->GetNSViewForHiding() frame]]; + [m_dummyNSView setAutoresizingMask: [owner->GetNSViewForHiding() autoresizingMask]]; + AssociateNSView(m_dummyNSView); +} + +wxWindowCocoaHider::~wxWindowCocoaHider() +{ + DisassociateNSView(m_dummyNSView); + [m_dummyNSView release]; +} + +void wxWindowCocoaHider::Cocoa_FrameChanged(void) +{ + // Keep the real window in synch with the dummy + wxASSERT(m_dummyNSView); + [m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]]; +} + + +#ifdef WXCOCOA_FILL_DUMMY_VIEW +bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect) +{ + NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:rect]; + [[NSColor greenColor] set]; + [bezpath stroke]; + [bezpath fill]; + return true; +} +#endif //def WXCOCOA_FILL_DUMMY_VIEW + +// ======================================================================== +// wxFlippedNSClipView +// ======================================================================== +@interface wxFlippedNSClipView : NSClipView +- (BOOL)isFlipped; +@end + +@implementation wxFlippedNSClipView : NSClipView +- (BOOL)isFlipped +{ + return YES; +} + +@end + +// ======================================================================== +// wxWindowCocoaScroller +// ======================================================================== +wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner) +: m_owner(owner) +{ + wxAutoNSAutoreleasePool pool; + wxASSERT(owner); + wxASSERT(owner->GetNSView()); + m_cocoaNSScrollView = [[NSScrollView alloc] + initWithFrame:[owner->GetNSView() frame]]; + AssociateNSView(m_cocoaNSScrollView); + + /* Replace the default NSClipView with a flipped one. This ensures + scrolling is "pinned" to the top-left instead of bottom-right. */ + NSClipView *flippedClip = [[wxFlippedNSClipView alloc] + initWithFrame: [[m_cocoaNSScrollView contentView] frame]]; + [m_cocoaNSScrollView setContentView:flippedClip]; + [flippedClip release]; + + [m_cocoaNSScrollView setBackgroundColor: [NSColor windowBackgroundColor]]; + [m_cocoaNSScrollView setHasHorizontalScroller: YES]; + [m_cocoaNSScrollView setHasVerticalScroller: YES]; + Encapsulate(); +} + +void wxWindowCocoaScroller::Encapsulate() +{ + // Set the scroll view autoresizingMask to match the current NSView + [m_cocoaNSScrollView setAutoresizingMask: [m_owner->GetNSView() autoresizingMask]]; + [m_owner->GetNSView() setAutoresizingMask: NSViewNotSizable]; + // NOTE: replaceSubView will cause m_cocaNSView to be released + // except when it hasn't been added into an NSView hierarchy in which + // case it doesn't need to be and this should work out to a no-op + m_owner->CocoaReplaceView(m_owner->GetNSView(), m_cocoaNSScrollView); + // The NSView is still retained by owner + [m_cocoaNSScrollView setDocumentView: m_owner->GetNSView()]; + // Now it's also retained by the NSScrollView +} + +void wxWindowCocoaScroller::Unencapsulate() +{ + [m_cocoaNSScrollView setDocumentView: nil]; + m_owner->CocoaReplaceView(m_cocoaNSScrollView, m_owner->GetNSView()); + if(![[m_owner->GetNSView() superview] isFlipped]) + [m_owner->GetNSView() setAutoresizingMask: NSViewMinYMargin]; +} + +wxWindowCocoaScroller::~wxWindowCocoaScroller() +{ + DisassociateNSView(m_cocoaNSScrollView); + [m_cocoaNSScrollView release]; +} + +void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height) +{ + NSSize frameSize = [NSScrollView + frameSizeForContentSize: NSMakeSize(width,height) + hasHorizontalScroller: [m_cocoaNSScrollView hasHorizontalScroller] + hasVerticalScroller: [m_cocoaNSScrollView hasVerticalScroller] + borderType: [m_cocoaNSScrollView borderType]]; + width = (int)frameSize.width; + height = (int)frameSize.height; +} + +void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const +{ + NSSize nssize = [m_cocoaNSScrollView contentSize]; + if(x) + *x = (int)nssize.width; + if(y) + *y = (int)nssize.height; +} + +void wxWindowCocoaScroller::Cocoa_FrameChanged(void) +{ + wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged")); + wxSizeEvent event(m_owner->GetSize(), m_owner->GetId()); + event.SetEventObject(m_owner); + m_owner->GetEventHandler()->ProcessEvent(event); +} +// ======================================================================== +// wxWindowCocoa +// ======================================================================== // normally the base classes aren't included, but wxWindow is special #ifdef __WXUNIVERSAL__ IMPLEMENT_ABSTRACT_CLASS(wxWindowCocoa, wxWindowBase) @@ -25,15 +247,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) BEGIN_EVENT_TABLE(wxWindowCocoa, wxWindowBase) END_EVENT_TABLE() +wxWindow *wxWindowCocoa::sm_capturedWindow = NULL; + // Constructor void wxWindowCocoa::Init() { - InitBase(); - m_cocoaNSView = NULL; - m_dummyNSView = NULL; + m_cocoaHider = NULL; + m_cocoaScroller = NULL; m_isBeingDeleted = FALSE; m_isInPaint = FALSE; + m_shouldBeEnabled = true; } // Constructor @@ -47,15 +271,15 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid, return false; // TODO: create the window - NSRect cocoaRect = NSMakeRect(10,10,20,20); m_cocoaNSView = NULL; - SetNSView([[NSView alloc] initWithFrame: cocoaRect]); + SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; if (m_parent) { m_parent->AddChild(this); m_parent->CocoaAddChild(this); + SetInitialFrameRect(pos,size); } return TRUE; @@ -64,71 +288,83 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid, // Destructor wxWindow::~wxWindow() { + wxAutoNSAutoreleasePool pool; DestroyChildren(); - if(m_parent) - m_parent->RemoveChild(this); - - CocoaRemoveFromParent(); + // Make sure our parent (in the wxWidgets sense) is our superview + // before we go removing from it. + if(m_parent && m_parent->GetNSView()==[GetNSViewForSuperview() superview]) + CocoaRemoveFromParent(); + delete m_cocoaHider; + delete m_cocoaScroller; + if(m_cocoaNSView) + SendDestroyEvent(); SetNSView(NULL); } void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child) { - [child->m_cocoaNSView retain]; - // NOTE: addSubView takes ownership of, but does not retain the subview - // Upon a removeFromView or closing the super view, the child WILL be - // released!!! I think the idea here is that normally you would alloc - // the subview and add it to the superview and this way you don't have - // to release what you just alloced. Unfortunately, that doesn't - // make sense for wxCocoa, so we do this instead. - [m_cocoaNSView addSubview: child->m_cocoaNSView]; - wxASSERT(!child->m_dummyNSView); - child->m_isShown = true; + NSView *childView = child->GetNSViewForSuperview(); + + wxASSERT(childView); + [m_cocoaNSView addSubview: childView]; + child->m_isShown = !m_cocoaHider; } void wxWindowCocoa::CocoaRemoveFromParent(void) { - if(m_dummyNSView) - { - wxASSERT(m_cocoaNSView); - // balances the alloc - [m_dummyNSView removeFromSuperview]; - // But since we also retained it ourselves - [m_dummyNSView release]; - m_dummyNSView = nil; - // m_cocoaNSView has of course already been removed by virtue of - // replaceSubview: m_cocoaNSView with: m_dummyNSView - } - else - [m_cocoaNSView removeFromSuperview]; + [GetNSViewForSuperview() removeFromSuperview]; } void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView) { bool need_debug = cocoaNSView || m_cocoaNSView; - if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d",this,m_cocoaNSView,[m_cocoaNSView retainCount]); + if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d"),this,m_cocoaNSView,[m_cocoaNSView retainCount]); DisassociateNSView(m_cocoaNSView); [cocoaNSView retain]; [m_cocoaNSView release]; m_cocoaNSView = cocoaNSView; AssociateNSView(m_cocoaNSView); - if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d",this,cocoaNSView,[cocoaNSView retainCount]); + if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d"),this,cocoaNSView,[cocoaNSView retainCount]); +} + +WX_NSView wxWindowCocoa::GetNSViewForSuperview() const +{ + return m_cocoaHider + ? m_cocoaHider->GetNSView() + : m_cocoaScroller + ? m_cocoaScroller->GetNSScrollView() + : m_cocoaNSView; +} + +WX_NSView wxWindowCocoa::GetNSViewForHiding() const +{ + return m_cocoaScroller + ? m_cocoaScroller->GetNSScrollView() + : m_cocoaNSView; } bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect) { - wxLogDebug("Cocoa_drawRect"); + wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect")); // Recursion can happen if the event loop runs from within the paint // handler. For instance, if an assertion dialog is shown. // FIXME: This seems less than ideal. if(m_isInPaint) { - wxLogDebug("Paint event recursion!"); + wxLogDebug(wxT("Paint event recursion!")); return false; } - //FIXME: should probably turn that rect into the update region m_isInPaint = TRUE; + + // Set m_updateRegion + const NSRect *rects = ▭ // The bounding box of the region + int countRects = 1; + // Try replacing the larger rectangle with a list of smaller ones: + if ([GetNSView() respondsToSelector:@selector(getRectsBeingDrawn:count:)]) + [GetNSView() getRectsBeingDrawn:&rects count:&countRects]; + m_updateRegion = wxRegion(rects,countRects); + wxPaintEvent event(m_windowId); event.SetEventObject(this); bool ret = GetEventHandler()->ProcessEvent(event); @@ -138,10 +374,9 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect) void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent) { - NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView; - wxASSERT_MSG([nsview window]==[cocoaEvent window],"Mouse event for different NSWindow"); - NSPoint cocoaPoint = [nsview convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil]; - NSRect cocoaRect = [nsview frame]; + wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],wxT("Mouse event for different NSWindow")); + NSPoint cocoaPoint = [m_cocoaNSView convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil]; + NSRect cocoaRect = [m_cocoaNSView frame]; const wxPoint &clientorigin = GetClientAreaOrigin(); event.m_x = (wxCoord)cocoaPoint.x - clientorigin.x; event.m_y = (wxCoord)(cocoaRect.size.height - cocoaPoint.y) - clientorigin.y; @@ -160,7 +395,7 @@ bool wxWindowCocoa::Cocoa_mouseMoved(WX_NSEvent theEvent) { wxMouseEvent event(wxEVT_MOTION); InitMouseEvent(event,theEvent); - wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y); + wxLogTrace(wxTRACE_COCOA,wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y); return GetEventHandler()->ProcessEvent(event); } @@ -178,7 +413,7 @@ bool wxWindowCocoa::Cocoa_mouseDown(WX_NSEvent theEvent) { wxMouseEvent event([theEvent clickCount]<2?wxEVT_LEFT_DOWN:wxEVT_LEFT_DCLICK); InitMouseEvent(event,theEvent); - wxLogDebug("Mouse Down @%d,%d num clicks=%d",event.m_x,event.m_y,[theEvent clickCount]); + wxLogTrace(wxTRACE_COCOA,wxT("Mouse Down @%d,%d num clicks=%d"),event.m_x,event.m_y,[theEvent clickCount]); return GetEventHandler()->ProcessEvent(event); } @@ -187,7 +422,7 @@ bool wxWindowCocoa::Cocoa_mouseDragged(WX_NSEvent theEvent) wxMouseEvent event(wxEVT_MOTION); InitMouseEvent(event,theEvent); event.m_leftDown = true; - wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y); + wxLogTrace(wxTRACE_COCOA,wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y); return GetEventHandler()->ProcessEvent(event); } @@ -195,23 +430,33 @@ bool wxWindowCocoa::Cocoa_mouseUp(WX_NSEvent theEvent) { wxMouseEvent event(wxEVT_LEFT_UP); InitMouseEvent(event,theEvent); - wxLogDebug("Mouse Up @%d,%d",event.m_x,event.m_y); + wxLogTrace(wxTRACE_COCOA,wxT("Mouse Up @%d,%d"),event.m_x,event.m_y); return GetEventHandler()->ProcessEvent(event); } bool wxWindowCocoa::Cocoa_rightMouseDown(WX_NSEvent theEvent) { - return false; + wxMouseEvent event([theEvent clickCount]<2?wxEVT_RIGHT_DOWN:wxEVT_RIGHT_DCLICK); + InitMouseEvent(event,theEvent); + wxLogDebug(wxT("Mouse Down @%d,%d num clicks=%d"),event.m_x,event.m_y,[theEvent clickCount]); + return GetEventHandler()->ProcessEvent(event); } bool wxWindowCocoa::Cocoa_rightMouseDragged(WX_NSEvent theEvent) { - return false; + wxMouseEvent event(wxEVT_MOTION); + InitMouseEvent(event,theEvent); + event.m_rightDown = true; + wxLogDebug(wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y); + return GetEventHandler()->ProcessEvent(event); } bool wxWindowCocoa::Cocoa_rightMouseUp(WX_NSEvent theEvent) { - return false; + wxMouseEvent event(wxEVT_RIGHT_UP); + InitMouseEvent(event,theEvent); + wxLogDebug(wxT("Mouse Up @%d,%d"),event.m_x,event.m_y); + return GetEventHandler()->ProcessEvent(event); } bool wxWindowCocoa::Cocoa_otherMouseDown(WX_NSEvent theEvent) @@ -231,48 +476,96 @@ bool wxWindowCocoa::Cocoa_otherMouseUp(WX_NSEvent theEvent) void wxWindowCocoa::Cocoa_FrameChanged(void) { - wxLogDebug("Cocoa_FrameChanged"); + wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged")); wxSizeEvent event(GetSize(), m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); } +bool wxWindowCocoa::Cocoa_resetCursorRects() +{ + if(!m_cursor.GetNSCursor()) + return false; + + [GetNSView() addCursorRect: [GetNSView() visibleRect] cursor: m_cursor.GetNSCursor()]; + + return true; +} + bool wxWindow::Close(bool force) { - return false; + // The only reason this function exists is that it is virtual and + // wxTopLevelWindowCocoa will override it. + return wxWindowBase::Close(force); +} + +void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView) +{ + [[oldView superview] replaceSubview:oldView with:newView]; +} + +bool wxWindow::EnableSelfAndChildren(bool enable) +{ + // If the state isn't changing, don't do anything + if(!wxWindowBase::Enable(enable && m_shouldBeEnabled)) + return false; + // Set the state of the Cocoa window + CocoaSetEnabled(m_isEnabled); + // Disable all children or (if enabling) return them to their proper state + for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + node; node = node->GetNext()) + { + node->GetData()->EnableSelfAndChildren(enable); + } + return true; +} + +bool wxWindow::Enable(bool enable) +{ + // Keep track of what the window SHOULD be doing + m_shouldBeEnabled = enable; + // If the parent is disabled for any reason, then this window will be too. + if(!IsTopLevel() && GetParent()) + { + enable = enable && GetParent()->IsEnabled(); + } + return EnableSelfAndChildren(enable); } bool wxWindow::Show(bool show) { + wxAutoNSAutoreleasePool pool; // If the window is marked as visible, then it shouldn't have a dummy view // If the window is marked hidden, then it should have a dummy view - wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),"wxWindow: m_isShown does not agree with m_dummyNSView"); + // wxSpinCtrl (generic) abuses m_isShown, don't use it for any logic +// wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),wxT("wxWindow: m_isShown does not agree with m_dummyNSView")); // Return false if there isn't a window to show or hide - if(!m_cocoaNSView) - return false; - // Return false if the state isn't changing - if( show == m_isShown ) + NSView *cocoaView = GetNSViewForHiding(); + if(!cocoaView) return false; if(show) { - // replaceSubView releases m_dummyNSView, balancing the alloc - [m_cocoaNSView retain]; - [[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView]; - // But since we also retained it ourselves - wxASSERT(![m_dummyNSView superview]); - [m_dummyNSView release]; - m_dummyNSView = nil; - wxASSERT([m_cocoaNSView superview]); + // If state isn't changing, return false + if(!m_cocoaHider) + return false; + CocoaReplaceView(m_cocoaHider->GetNSView(), cocoaView); + wxASSERT(![m_cocoaHider->GetNSView() superview]); + delete m_cocoaHider; + m_cocoaHider = NULL; + wxASSERT([cocoaView superview]); } else { - m_dummyNSView = [[NSView alloc] initWithFrame: [m_cocoaNSView frame]]; - [m_dummyNSView retain]; - // NOTE: replaceSubView will cause m_cocaNSView to be released - [[m_cocoaNSView superview] replaceSubview:m_cocoaNSView with:m_dummyNSView]; + // If state isn't changing, return false + if(m_cocoaHider) + return false; + m_cocoaHider = new wxWindowCocoaHider(this); + // NOTE: replaceSubview:with will cause m_cocaNSView to be + // (auto)released which balances out addSubview + CocoaReplaceView(cocoaView, m_cocoaHider->GetNSView()); // m_coocaNSView is now only retained by us - wxASSERT([m_dummyNSView superview]); - wxASSERT(![m_cocoaNSView superview]); + wxASSERT([m_cocoaHider->GetNSView() superview]); + wxASSERT(![cocoaView superview]); } m_isShown = show; return true; @@ -280,7 +573,7 @@ bool wxWindow::Show(bool show) void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags) { -// wxLogDebug("wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)",this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":"."); + wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)"),this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":"."); int currentX, currentY; int currentW, currentH; DoGetPosition(¤tX, ¤tY); @@ -318,46 +611,84 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags DoMoveWindow(x,y,width,height); } +#if wxUSE_TOOLTIPS + +void wxWindowCocoa::DoSetToolTip( wxToolTip *tip ) +{ + wxWindowBase::DoSetToolTip(tip); + + if ( m_tooltip ) + { + m_tooltip->SetWindow((wxWindow *)this); + } +} + +#endif + void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height) { -// wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height); + wxAutoNSAutoreleasePool pool; + wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)"),this,x,y,width,height); - NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView; + NSView *nsview = GetNSViewForSuperview(); NSView *superview = [nsview superview]; - wxCHECK_RET(superview,"NSView does not have a superview"); - NSRect parentRect = [superview frame]; + wxCHECK_RET(superview,wxT("NSView does not have a superview")); + NSRect parentRect = [superview bounds]; NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height); - [m_cocoaNSView setFrame: cocoaRect]; - // Also change the dummy's size - if(m_dummyNSView) - [m_dummyNSView setFrame: cocoaRect]; + [nsview setFrame: cocoaRect]; + // Be sure to redraw the parent to reflect the changed position + [superview setNeedsDisplay:YES]; +} + +void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size) +{ + NSView *nsview = GetNSViewForSuperview(); + NSView *superview = [nsview superview]; + wxCHECK_RET(superview,wxT("NSView does not have a superview")); + NSRect parentRect = [superview bounds]; + NSRect frameRect = [nsview frame]; + if(size.x!=-1) + frameRect.size.width = size.x; + if(size.y!=-1) + frameRect.size.height = size.y; + frameRect.origin.x = pos.x; + frameRect.origin.y = parentRect.size.height-(pos.y+frameRect.size.height); + // Tell Cocoa to change the margin between the bottom of the superview + // and the bottom of the control. Keeps the control pinned to the top + // of its superview so that its position in the wxWidgets coordinate + // system doesn't change. + if(![superview isFlipped]) + [nsview setAutoresizingMask: NSViewMinYMargin]; + // MUST set the mask before setFrame: which can generate a size event + // and cause a scroller to be added! + [nsview setFrame: frameRect]; } // Get total size void wxWindow::DoGetSize(int *w, int *h) const { - NSRect cocoaRect = [m_cocoaNSView frame]; + NSRect cocoaRect = [GetNSViewForSuperview() frame]; if(w) *w=(int)cocoaRect.size.width; if(h) *h=(int)cocoaRect.size.height; -// wxLogDebug("wxWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height); + wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetSize = (%d,%d)"),this,(int)cocoaRect.size.width,(int)cocoaRect.size.height); } void wxWindow::DoGetPosition(int *x, int *y) const { - NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView; + NSView *nsview = GetNSViewForSuperview(); NSView *superview = [nsview superview]; - wxCHECK_RET(superview,"NSView does not have a superview"); - NSRect parentRect = [superview frame]; + wxCHECK_RET(superview,wxT("NSView does not have a superview")); + NSRect parentRect = [superview bounds]; NSRect cocoaRect = [nsview frame]; if(x) *x=(int)cocoaRect.origin.x; if(y) *y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height)); -// wxLogDebug("wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y); + wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y); } WXWidget wxWindow::GetHandle() const @@ -365,6 +696,11 @@ WXWidget wxWindow::GetHandle() const return m_cocoaNSView; } +wxWindow* wxWindow::GetWxWindow() const +{ + return (wxWindow*) this; +} + void wxWindow::Refresh(bool eraseBack, const wxRect *rect) { [m_cocoaNSView setNeedsDisplay:YES]; @@ -372,17 +708,26 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect) void wxWindow::SetFocus() { - // TODO +#ifdef __WXDEBUG__ + bool bOK = +#endif + [GetNSView() lockFocusIfCanDraw]; + + //Note that the normal lockFocus works on hidden and minimized windows + //and has no return value - which probably isn't what we want + wxASSERT(bOK); } void wxWindow::DoCaptureMouse() { // TODO + sm_capturedWindow = this; } void wxWindow::DoReleaseMouse() { // TODO + sm_capturedWindow = NULL; } void wxWindow::DoScreenToClient(int *x, int *y) const @@ -398,15 +743,24 @@ void wxWindow::DoClientToScreen(int *x, int *y) const // Get size *available for subwindows* i.e. excluding menu bar etc. void wxWindow::DoGetClientSize(int *x, int *y) const { - wxLogDebug("DoGetClientSize:"); - wxWindowCocoa::DoGetSize(x,y); - // TODO: Actually account for menubar, borders, etc... + wxLogTrace(wxTRACE_COCOA,wxT("DoGetClientSize:")); + if(m_cocoaScroller) + m_cocoaScroller->DoGetClientSize(x,y); + else + wxWindowCocoa::DoGetSize(x,y); } void wxWindow::DoSetClientSize(int width, int height) { - wxLogDebug("DoSetClientSize=(%d,%d)",width,height); - // TODO + wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("DoSetClientSize=(%d,%d)"),width,height); + if(m_cocoaScroller) + m_cocoaScroller->ClientSizeToSize(width,height); + CocoaSetWxWindowSize(width,height); +} + +void wxWindow::CocoaSetWxWindowSize(int width, int height) +{ + wxWindowCocoa::DoSetSize(-1,-1,width,height,wxSIZE_USE_EXISTING); } int wxWindow::GetCharHeight() const @@ -458,10 +812,19 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh) // TODO } +void wxWindow::CocoaCreateNSScrollView() +{ + if(!m_cocoaScroller) + { + m_cocoaScroller = new wxWindowCocoaScroller(this); + } +} + // New function that will replace some of the above. void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, int range, bool refresh) { + CocoaCreateNSScrollView(); // TODO } @@ -471,31 +834,58 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) // TODO } +void wxWindow::DoSetVirtualSize( int x, int y ) +{ + wxWindowBase::DoSetVirtualSize(x,y); + CocoaCreateNSScrollView(); + [m_cocoaNSView setFrameSize:NSMakeSize(m_virtualSize.x,m_virtualSize.y)]; +} + bool wxWindow::SetFont(const wxFont& font) { // TODO return TRUE; } -void wxWindow::Clear() +static int CocoaRaiseWindowCompareFunction(id first, id second, void *target) { - // TODO + // first should be ordered higher + if(first==target) + return NSOrderedDescending; + // second should be ordered higher + if(second==target) + return NSOrderedAscending; + return NSOrderedSame; } // Raise the window to the top of the Z order void wxWindow::Raise() { - NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView; - NSView *superview = [nsview superview]; - [nsview retain]; - [nsview removeFromSuperview]; - [superview addSubview:nsview]; +// wxAutoNSAutoreleasePool pool; + NSView *nsview = GetNSViewForSuperview(); + [[nsview superview] sortSubviewsUsingFunction: + CocoaRaiseWindowCompareFunction + context: nsview]; +} + +static int CocoaLowerWindowCompareFunction(id first, id second, void *target) +{ + // first should be ordered lower + if(first==target) + return NSOrderedAscending; + // second should be ordered lower + if(second==target) + return NSOrderedDescending; + return NSOrderedSame; } // Lower the window to the bottom of the Z order void wxWindow::Lower() { - // TODO + NSView *nsview = GetNSViewForSuperview(); + [[nsview superview] sortSubviewsUsingFunction: + CocoaLowerWindowCompareFunction + context: nsview]; } bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) @@ -504,16 +894,20 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) } // Get the window with the focus -wxWindow *wxWindowBase::FindFocus() +wxWindow *wxWindowBase::DoFindFocus() { - // TODO - return NULL; + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa([NSView focusView]); + + if (!win) + return NULL; + + return win->GetWxWindow(); } /* static */ wxWindow *wxWindowBase::GetCapture() { // TODO - return NULL; + return wxWindowCocoa::sm_capturedWindow; } wxWindow *wxGetActiveWindow() @@ -522,3 +916,15 @@ wxWindow *wxGetActiveWindow() return NULL; } +wxPoint wxGetMousePosition() +{ + // TODO + return wxDefaultPosition; +} + +wxWindow* wxFindWindowAtPointer(wxPoint& pt) +{ + pt = wxGetMousePosition(); + return NULL; +} +