// 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 <AppKit/NSColor.h>
#import <AppKit/NSClipView.h>
+// Turn this on to paint green over the dummy views for debugging
+#undef WXCOCOA_FILL_DUMMY_VIEW
+
+#ifdef WXCOCOA_FILL_DUMMY_VIEW
+#import <AppKit/NSBezierPath.h>
+#endif //def WXCOCOA_FILL_DUMMY_VIEW
+
// ========================================================================
// wxWindowCocoaHider
// ========================================================================
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();
};
+// ========================================================================
+// wxDummyNSView
+// ========================================================================
+@interface wxDummyNSView : NSView
+- (NSView *)hitTest:(NSPoint)aPoint;
+@end
+
+@implementation wxDummyNSView : NSView
+- (NSView *)hitTest:(NSPoint)aPoint
+{
+ return nil;
+}
+
+@end
+
// ========================================================================
// wxWindowCocoaHider
// ========================================================================
{
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);
}
[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
// ========================================================================
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_cocoaNSScrollView setDocumentView: nil];
m_owner->CocoaReplaceView(m_cocoaNSScrollView, m_owner->GetNSView());
+ if(![[m_owner->GetNSView() superview] isFlipped])
+ [m_owner->GetNSView() setAutoresizingMask: NSViewMinYMargin];
}
wxWindowCocoaScroller::~wxWindowCocoaScroller()
// Constructor
void wxWindowCocoa::Init()
{
- InitBase();
-
m_cocoaNSView = NULL;
m_cocoaHider = NULL;
m_cocoaScroller = NULL;
wxAutoNSAutoreleasePool pool;
DestroyChildren();
- if(m_parent)
- m_parent->RemoveChild(this);
-
CocoaRemoveFromParent();
delete m_cocoaHider;
delete m_cocoaScroller;
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();
frameRect.size.height = size.y;
frameRect.origin.x = pos.x;
frameRect.origin.y = parentRect.size.height-(pos.y+frameRect.size.height);
- [nsview setFrame: frameRect];
// 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];
}
// Get total size