Laid groundwork for scrolling.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h
index 4097dfa0772252d20ff53a1387ea7a36b2c8a97e..f36f37222e58055cf70629831464cccae4f7750b 100644 (file)
--- a/include/wx/cocoa/window.h
+++ b/include/wx/cocoa/window.h
@@ -14,6 +14,8 @@
 
 #include "wx/cocoa/NSView.h"
 
 
 #include "wx/cocoa/NSView.h"
 

+class wxWindowCocoaHider;
+

 // ========================================================================
 // wxWindowCocoa
 // ========================================================================
 // ========================================================================
 // wxWindowCocoa
 // ========================================================================


@@ -51,7 +53,12 @@ protected:
 // Cocoa specifics
 // ------------------------------------------------------------------------
 public:
 // Cocoa specifics
 // ------------------------------------------------------------------------
 public:

+    // Returns the content NSView (where children are added, drawing performed)

     inline WX_NSView GetNSView() { return m_cocoaNSView; }
     inline WX_NSView GetNSView() { return m_cocoaNSView; }

+    // Returns the NSView suitable for use as a subview
+    WX_NSView GetNSViewForSuperview() const;
+    // Returns the NSView that may be hidden/is being hidden
+    WX_NSView GetNSViewForHiding() const;

     void CocoaAddChild(wxWindowCocoa *child);
     void CocoaRemoveFromParent(void);
 protected:
     void CocoaAddChild(wxWindowCocoa *child);
     void CocoaRemoveFromParent(void);
 protected:


@@ -72,9 +79,10 @@ protected:
     virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent);
     void SetNSView(WX_NSView cocoaNSView);
     WX_NSView m_cocoaNSView;
     virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent);
     void SetNSView(WX_NSView cocoaNSView);
     WX_NSView m_cocoaNSView;

-    WX_NSView m_dummyNSView;
+    wxWindowCocoaHider *m_cocoaHider;

     bool m_isInPaint;
     static wxWindow *sm_capturedWindow;
     bool m_isInPaint;
     static wxWindow *sm_capturedWindow;

+    virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 8405b331827152973c53c41f4e5e563c8f89d2f5..80d7260ea0319a31af36ca999bac1a080b930467 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -17,6 +17,53 @@
 #import <Appkit/NSView.h>
 #import <AppKit/NSEvent.h>
 
 #import <Appkit/NSView.h>
 #import <AppKit/NSEvent.h>
 

+// ========================================================================
+// 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);
+private:
+    wxWindowCocoaHider();
+};
+
+// ========================================================================
+// wxWindowCocoaHider
+// ========================================================================
+wxWindowCocoaHider::wxWindowCocoaHider(wxWindow *owner)
+:   m_owner(owner)
+{
+    wxASSERT(owner);
+    wxASSERT(owner->GetNSViewForHiding());
+    m_dummyNSView = [[NSView alloc]
+        initWithFrame:[owner->GetNSViewForHiding() frame]];
+    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]];
+}
+
+// ========================================================================
+// wxWindowCocoa
+// ========================================================================

 // normally the base classes aren't included, but wxWindow is special
 #ifdef __WXUNIVERSAL__
 IMPLEMENT_ABSTRACT_CLASS(wxWindowCocoa, wxWindowBase)
 // normally the base classes aren't included, but wxWindow is special
 #ifdef __WXUNIVERSAL__
 IMPLEMENT_ABSTRACT_CLASS(wxWindowCocoa, wxWindowBase)


@@ -35,7 +82,7 @@ void wxWindowCocoa::Init()
     InitBase();
 
     m_cocoaNSView = NULL;
     InitBase();
 
     m_cocoaNSView = NULL;

-    m_dummyNSView = NULL;
+    m_cocoaHider = NULL;

     m_isBeingDeleted = FALSE;
     m_isInPaint = FALSE;
 }
     m_isBeingDeleted = FALSE;
     m_isInPaint = FALSE;
 }


@@ -75,31 +122,22 @@ wxWindow::~wxWindow()
         m_parent->RemoveChild(this);
 
     CocoaRemoveFromParent();
         m_parent->RemoveChild(this);
 
     CocoaRemoveFromParent();

+    delete m_cocoaHider;

     SetNSView(NULL);
 }
 
 void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child)
 {
     SetNSView(NULL);
 }
 
 void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child)
 {

-    [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)
 {
 }
 
 void wxWindowCocoa::CocoaRemoveFromParent(void)
 {

-    if(m_dummyNSView)
-    {
-        wxASSERT(m_cocoaNSView);
-        // balances the replaceSubView:with:
-        [m_dummyNSView removeFromSuperview];
-        // But since we were the ones to alloc it
-        [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)
 }
 
 void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)


@@ -114,6 +152,18 @@ void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
     if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d",this,cocoaNSView,[cocoaNSView retainCount]);
 }
 
     if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d",this,cocoaNSView,[cocoaNSView retainCount]);
 }
 

+WX_NSView wxWindowCocoa::GetNSViewForSuperview() const
+{
+    return m_cocoaHider
+        ?   m_cocoaHider->GetNSView()
+        :   m_cocoaNSView;
+}
+
+WX_NSView wxWindowCocoa::GetNSViewForHiding() const
+{
+    return m_cocoaNSView;
+}
+

 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 {
     wxLogDebug("Cocoa_drawRect");
 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 {
     wxLogDebug("Cocoa_drawRect");


@@ -136,10 +186,9 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 
 void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
 {
 
 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],"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;
     const wxPoint &clientorigin = GetClientAreaOrigin();
     event.m_x = (wxCoord)cocoaPoint.x - clientorigin.x;
     event.m_y = (wxCoord)(cocoaRect.size.height - cocoaPoint.y) - clientorigin.y;


@@ -240,6 +289,11 @@ bool wxWindow::Close(bool force)
     return false;
 }
 
     return false;
 }
 

+void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
+{
+    [[oldView superview] replaceSubview:oldView with:newView];
+}
+

 bool wxWindow::Show(bool show)
 {
     wxAutoNSAutoreleasePool pool;
 bool wxWindow::Show(bool show)
 {
     wxAutoNSAutoreleasePool pool;


@@ -248,34 +302,32 @@ bool wxWindow::Show(bool show)
     // 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");
     // Return false if there isn't a window to show or hide
     // 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");
     // Return false if there isn't a window to show or hide

-    if(!m_cocoaNSView)
+    NSView *cocoaView = GetNSViewForHiding();
+    if(!cocoaView)

         return false;
     if(show)
     {
         // If state isn't changing, return false
         return false;
     if(show)
     {
         // If state isn't changing, return false

-        if(!m_dummyNSView)
+        if(!m_cocoaHider)

             return false;
             return false;

-        // replaceSubView:with: releases m_dummyNSView, balancing the
-        // previous replaceSubView:with
-        [[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView];
-        wxASSERT(![m_dummyNSView superview]);
-        // But since we were the ones to alloc it
-        [m_dummyNSView release];
-        m_dummyNSView = nil;
-        wxASSERT([m_cocoaNSView superview]);
+        CocoaReplaceView(m_cocoaHider->GetNSView(), cocoaView);
+        wxASSERT(![m_cocoaHider->GetNSView() superview]);
+        delete m_cocoaHider;
+        m_cocoaHider = NULL;
+        wxASSERT([cocoaView superview]);

     }
     else
     {
         // If state isn't changing, return false
     }
     else
     {
         // If state isn't changing, return false

-        if(m_dummyNSView)
+        if(m_cocoaHider)

             return false;
             return false;

-        m_dummyNSView = [[NSView alloc] initWithFrame: [m_cocoaNSView frame]];
-        // NOTE: replaceSubView will cause m_cocaNSView to be (auto)released
-        // which balances out addSubView
-        [[m_cocoaNSView superview] replaceSubview:m_cocoaNSView with:m_dummyNSView];
+        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
         // 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;
     }
     m_isShown = show;
     return true;


@@ -325,22 +377,19 @@ void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
 //    wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
 
 {
 //    wxLogDebug("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];
 
     NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height);
     NSView *superview = [nsview superview];
     wxCHECK_RET(superview,"NSView does not have a superview");
     NSRect parentRect = [superview frame];
 
     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];

 }
 
 // Get total size
 void wxWindow::DoGetSize(int *w, int *h) const
 {
 }
 
 // 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)
     if(w)
         *w=(int)cocoaRect.size.width;
     if(h)


@@ -350,7 +399,7 @@ void wxWindow::DoGetSize(int *w, int *h) const
 
 void wxWindow::DoGetPosition(int *x, int *y) const
 {
 
 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];
     NSView *superview = [nsview superview];
     wxCHECK_RET(superview,"NSView does not have a superview");
     NSRect parentRect = [superview frame];


@@ -491,7 +540,7 @@ void wxWindow::Clear()
 void wxWindow::Raise()
 {
     wxAutoNSAutoreleasePool pool;
 void wxWindow::Raise()
 {
     wxAutoNSAutoreleasePool pool;

-    NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView;
+    NSView *nsview = GetNSViewForSuperview();

     NSView *superview = [nsview superview];
     [nsview removeFromSuperview];
     [superview addSubview:nsview];
     NSView *superview = [nsview superview];
     [nsview removeFromSuperview];
     [superview addSubview:nsview];