Applied patch [ 863936 ] wxGrid scroll bars not drawn.

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 0b0bb5ede7db21dcbd5a6236362feca4ffbdac7f..1ce1295c5052ba06179960da8248cd372cb4e887 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -240,8 +240,6 @@ wxWindow *wxWindowCocoa::sm_capturedWindow = NULL;
 // Constructor
 void wxWindowCocoa::Init()
 {
-    InitBase();
-
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_cocoaScroller = NULL;
@@ -281,9 +279,6 @@ wxWindow::~wxWindow()
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 
-    if(m_parent)
-        m_parent->RemoveChild(this);
-
     CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;
@@ -573,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)
 {
+    wxAutoNSAutoreleasePool pool;
 //    wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
 
     NSView *nsview = GetNSViewForSuperview();