X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75e4856bba2ae491a6e90c93fa148fab7bea2435..461fe6e2559a3096d4985a50ba106f26ed890a1d:/src/cocoa/window.mm

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 7917916774..0b0bb5ede7 100644
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -9,8 +9,11 @@
 // 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"
 
@@ -165,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
@@ -178,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()
@@ -591,13 +599,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);
-    [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