call AddChild() when the control is already reallly created

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 06d75e461139b50163649fe4a33a65a48ea9ef0f..f33b1a2a3d2ed8deef1425bd7e4c15eabe555f2f 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -810,8 +810,6 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 

-    parent->AddChild(this);
-

     m_windowVariant = parent->GetWindowVariant() ;
 
     if ( m_macIsUserPane )
     m_windowVariant = parent->GetWindowVariant() ;
 
     if ( m_macIsUserPane )


@@ -865,6 +863,7 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
 
     m_peer->SetReference( (long) this ) ;
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
 
     m_peer->SetReference( (long) this ) ;

+    GetParent()->AddChild(this);

 
     MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );
 
 
     MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );