More lib and demo patches to drop the wx prefix (Jeff has been busy!)

[wxWidgets.git] / src / cocoa / window.mm

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 759671ac120f24c1402104c3f716e6185fbc54f9..1ce1295c5052ba06179960da8248cd372cb4e887 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -9,8 +9,11 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 
 #include "wx/cocoa/autorelease.h"
 


@@ -20,6 +23,13 @@
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.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
 // ========================================================================
 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================


@@ -34,6 +44,9 @@ protected:
     wxWindowCocoa *m_owner;
     WX_NSView m_dummyNSView;
     virtual void Cocoa_FrameChanged(void);
     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();
 };
 private:
     wxWindowCocoaHider();
 };


@@ -60,6 +73,21 @@ private:
     wxWindowCocoaScroller();
 };
 
     wxWindowCocoaScroller();
 };
 

+// ========================================================================
+// wxDummyNSView
+// ========================================================================
+@interface wxDummyNSView : NSView
+- (NSView *)hitTest:(NSPoint)aPoint;
+@end
+
+@implementation wxDummyNSView : NSView
+- (NSView *)hitTest:(NSPoint)aPoint
+{
+    return nil;
+}
+
+@end
+

 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================
 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================


@@ -68,8 +96,9 @@ wxWindowCocoaHider::wxWindowCocoaHider(wxWindow *owner)
 {
     wxASSERT(owner);
     wxASSERT(owner->GetNSViewForHiding());
 {
     wxASSERT(owner);
     wxASSERT(owner->GetNSViewForHiding());

-    m_dummyNSView = [[NSView alloc]
+    m_dummyNSView = [[wxDummyNSView alloc]

         initWithFrame:[owner->GetNSViewForHiding() frame]];
         initWithFrame:[owner->GetNSViewForHiding() frame]];

+    [m_dummyNSView setAutoresizingMask: [owner->GetNSViewForHiding() autoresizingMask]];

     AssociateNSView(m_dummyNSView);
 }
 
     AssociateNSView(m_dummyNSView);
 }
 


@@ -86,6 +115,17 @@ void wxWindowCocoaHider::Cocoa_FrameChanged(void)
     [m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]];
 }
 
     [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
 // ========================================================================
 // ========================================================================
 // wxFlippedNSClipView
 // ========================================================================


@@ -128,6 +168,9 @@ wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
 
 void wxWindowCocoaScroller::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
     // 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());
 {
     [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()
 }
 
 wxWindowCocoaScroller::~wxWindowCocoaScroller()


@@ -195,8 +240,6 @@ wxWindow *wxWindowCocoa::sm_capturedWindow = NULL;
 // Constructor
 void wxWindowCocoa::Init()
 {
 // Constructor
 void wxWindowCocoa::Init()
 {

-    InitBase();
-

     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_cocoaScroller = NULL;
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_cocoaScroller = NULL;


@@ -236,9 +279,6 @@ wxWindow::~wxWindow()
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 

-    if(m_parent)
-        m_parent->RemoveChild(this);
-

     CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;
     CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;


@@ -528,6 +568,7 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
 
 void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
 
 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();
 //    wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
 
     NSView *nsview = GetNSViewForSuperview();


@@ -554,13 +595,15 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
         frameRect.size.height = size.y;
     frameRect.origin.x = pos.x;
     frameRect.origin.y = parentRect.size.height-(pos.y+frameRect.size.height);
         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];
     // 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
 }
 
 // Get total size