reSWIGged

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index b5d0aabd32999eb6ba379c18ef57f9069a45e6bb..1ce1295c5052ba06179960da8248cd372cb4e887 100644 (file)
--- 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"
 
@@ -237,8 +240,6 @@ wxWindow *wxWindowCocoa::sm_capturedWindow = NULL;
 // Constructor
 void wxWindowCocoa::Init()
 {
-    InitBase();
-
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_cocoaScroller = NULL;
@@ -278,9 +279,6 @@ wxWindow::~wxWindow()
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 
-    if(m_parent)
-        m_parent->RemoveChild(this);
-
     CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;
@@ -570,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();