Use setAutoresizingMask: NSViewMinYMargin to keep subviews in the same

position relative to the wxWindows coordinate system

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

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index c9eec7426de1c288bc148bbcb6ef0670e905bb4b..4f3d12062faf5b22c873faca9ca3e7f52e2ecedc 100644 (file)
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -168,7 +168,7 @@ void wxFrame::SetStatusBar(wxStatusBar *statusbar)
     if(m_frameStatusBar)
     {
         [m_frameStatusBar->GetNSViewForSuperview() removeFromSuperview];
-        [m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewNotSizable];
+        [m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
         if(m_frameStatusBar->GetParent())
             m_frameStatusBar->GetParent()->CocoaAddChild(m_frameToolBar);
     }
@@ -199,7 +199,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
     if(m_frameToolBar)
     {
         [m_frameToolBar->GetNSViewForSuperview() removeFromSuperview];
-        [m_frameToolBar->GetNSViewForSuperview() setAutoresizingMask: NSViewNotSizable];
+        [m_frameToolBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
         if(m_frameToolBar->GetParent())
             m_frameToolBar->GetParent()->CocoaAddChild(m_frameToolBar);
     }

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 1ef455d8105f67a6b88e71ee53249e46595ce993..964d65e8da7ee9234697faa8e91b22ed057bc424 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -524,6 +524,12 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
     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];
 }
 
 // Get total size