X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e08efb8dd9d9af576baec04aa77a7ea4bd31de3b..8ce0312ea0f0c1981571cc4fff7c063e30d32d3f:/src/cocoa/window.mm?ds=inline diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 017b2de47e..b5d0aabd32 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -20,6 +20,13 @@ #import #import +// 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 + // ======================================================================== // wxWindowCocoaHider // ======================================================================== @@ -34,6 +41,9 @@ 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(); }; @@ -60,6 +70,21 @@ private: wxWindowCocoaScroller(); }; +// ======================================================================== +// wxDummyNSView +// ======================================================================== +@interface wxDummyNSView : NSView +- (NSView *)hitTest:(NSPoint)aPoint; +@end + +@implementation wxDummyNSView : NSView +- (NSView *)hitTest:(NSPoint)aPoint +{ + return nil; +} + +@end + // ======================================================================== // wxWindowCocoaHider // ======================================================================== @@ -68,8 +93,9 @@ wxWindowCocoaHider::wxWindowCocoaHider(wxWindow *owner) { wxASSERT(owner); wxASSERT(owner->GetNSViewForHiding()); - m_dummyNSView = [[NSView alloc] + m_dummyNSView = [[wxDummyNSView alloc] initWithFrame:[owner->GetNSViewForHiding() frame]]; + [m_dummyNSView setAutoresizingMask: [owner->GetNSViewForHiding() autoresizingMask]]; AssociateNSView(m_dummyNSView); } @@ -86,6 +112,17 @@ void wxWindowCocoaHider::Cocoa_FrameChanged(void) [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 // ======================================================================== @@ -128,6 +165,9 @@ wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner) 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 @@ -141,6 +181,8 @@ 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() @@ -202,6 +244,7 @@ void wxWindowCocoa::Init() m_cocoaScroller = NULL; m_isBeingDeleted = FALSE; m_isInPaint = FALSE; + m_shouldBeEnabled = true; } // Constructor @@ -408,7 +451,9 @@ void wxWindowCocoa::Cocoa_FrameChanged(void) 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) @@ -416,6 +461,34 @@ 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; @@ -502,10 +575,12 @@ void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height) NSView *nsview = GetNSViewForSuperview(); NSView *superview = [nsview superview]; wxCHECK_RET(superview,"NSView does not have a superview"); - NSRect parentRect = [superview frame]; + NSRect parentRect = [superview bounds]; NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height); [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) @@ -513,14 +588,22 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size) NSView *nsview = GetNSViewForSuperview(); NSView *superview = [nsview superview]; wxCHECK_RET(superview,"NSView does not have a superview"); - NSRect parentRect = [superview frame]; + 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+size.y); + 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 wxWindows 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]; } @@ -540,7 +623,7 @@ void wxWindow::DoGetPosition(int *x, int *y) const NSView *nsview = GetNSViewForSuperview(); NSView *superview = [nsview superview]; wxCHECK_RET(superview,"NSView does not have a superview"); - NSRect parentRect = [superview frame]; + NSRect parentRect = [superview bounds]; NSRect cocoaRect = [nsview frame]; if(x)