X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/816c52cf7c8abe346454f548f59ee889016d1ada..7b28e0ede49ca78e05df6bc6af2d2d8c508f8455:/src/cocoa/window.mm diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 97bcc62a5e..7ae5fdf02a 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -9,17 +9,27 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include "wx/window.h" -#include "wx/log.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/window.h" +#endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" -#import +#import #import #import #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 +44,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 +73,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 +96,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 +115,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 +168,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 +184,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() @@ -156,22 +201,22 @@ void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height) hasHorizontalScroller: [m_cocoaNSScrollView hasHorizontalScroller] hasVerticalScroller: [m_cocoaNSScrollView hasVerticalScroller] borderType: [m_cocoaNSScrollView borderType]]; - width = frameSize.width; - height = frameSize.height; + width = (int)frameSize.width; + height = (int)frameSize.height; } void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const { NSSize nssize = [m_cocoaNSScrollView contentSize]; if(x) - *x = nssize.width; + *x = (int)nssize.width; if(y) - *y = nssize.height; + *y = (int)nssize.height; } void wxWindowCocoaScroller::Cocoa_FrameChanged(void) { - wxLogDebug("Cocoa_FrameChanged"); + wxLogDebug(wxT("Cocoa_FrameChanged")); wxSizeEvent event(m_owner->GetSize(), m_owner->GetId()); event.SetEventObject(m_owner); m_owner->GetEventHandler()->ProcessEvent(event); @@ -195,13 +240,12 @@ wxWindow *wxWindowCocoa::sm_capturedWindow = NULL; // Constructor void wxWindowCocoa::Init() { - InitBase(); - m_cocoaNSView = NULL; m_cocoaHider = NULL; m_cocoaScroller = NULL; m_isBeingDeleted = FALSE; m_isInPaint = FALSE; + m_shouldBeEnabled = true; } // Constructor @@ -235,9 +279,6 @@ wxWindow::~wxWindow() wxAutoNSAutoreleasePool pool; DestroyChildren(); - if(m_parent) - m_parent->RemoveChild(this); - CocoaRemoveFromParent(); delete m_cocoaHider; delete m_cocoaScroller; @@ -261,13 +302,13 @@ void wxWindowCocoa::CocoaRemoveFromParent(void) 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) wxLogDebug(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) wxLogDebug(wxT("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d"),this,cocoaNSView,[cocoaNSView retainCount]); } WX_NSView wxWindowCocoa::GetNSViewForSuperview() const @@ -288,13 +329,13 @@ WX_NSView wxWindowCocoa::GetNSViewForHiding() const bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect) { - wxLogDebug("Cocoa_drawRect"); + wxLogDebug(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 @@ -308,7 +349,7 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect) void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent) { - wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],"Mouse event for different NSWindow"); + 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(); @@ -329,7 +370,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); + wxLogDebug(wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y); return GetEventHandler()->ProcessEvent(event); } @@ -347,7 +388,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]); + wxLogDebug(wxT("Mouse Down @%d,%d num clicks=%d"),event.m_x,event.m_y,[theEvent clickCount]); return GetEventHandler()->ProcessEvent(event); } @@ -356,7 +397,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); + wxLogDebug(wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y); return GetEventHandler()->ProcessEvent(event); } @@ -364,7 +405,7 @@ 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); + wxLogDebug(wxT("Mouse Up @%d,%d"),event.m_x,event.m_y); return GetEventHandler()->ProcessEvent(event); } @@ -400,7 +441,7 @@ bool wxWindowCocoa::Cocoa_otherMouseUp(WX_NSEvent theEvent) void wxWindowCocoa::Cocoa_FrameChanged(void) { - wxLogDebug("Cocoa_FrameChanged"); + wxLogDebug(wxT("Cocoa_FrameChanged")); wxSizeEvent event(GetSize(), m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); @@ -408,7 +449,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,13 +459,41 @@ 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 // wxSpinCtrl (generic) abuses m_isShown, don't use it for any logic -// wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),"wxWindow: m_isShown does not agree with m_dummyNSView"); +// 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 NSView *cocoaView = GetNSViewForHiding(); if(!cocoaView) @@ -497,30 +568,41 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height) { + wxAutoNSAutoreleasePool pool; // wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height); 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); [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,"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 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]; } @@ -539,8 +621,8 @@ 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]; + wxCHECK_RET(superview,wxT("NSView does not have a superview")); + NSRect parentRect = [superview bounds]; NSRect cocoaRect = [nsview frame]; if(x) @@ -590,7 +672,7 @@ 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:"); + wxLogDebug(wxT("DoGetClientSize:")); if(m_cocoaScroller) m_cocoaScroller->DoGetClientSize(x,y); else @@ -599,8 +681,15 @@ void wxWindow::DoGetClientSize(int *x, int *y) const void wxWindow::DoSetClientSize(int width, int height) { - wxLogDebug("DoSetClientSize=(%d,%d)",width,height); - // TODO + wxLogDebug(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 @@ -664,6 +753,7 @@ void wxWindow::CocoaCreateNSScrollView() void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, int range, bool refresh) { + CocoaCreateNSScrollView(); // TODO }