Update to wxWidgets r67291.

Fixes a wxFileSelector regression on OS X.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7404 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-03-23 09:13:01 +00:00
parent c990f12932
commit 35508d7a99
115 changed files with 1263 additions and 734 deletions

View File

@ -4,7 +4,7 @@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id: window_osx.cpp 67254 2011-03-20 00:14:35Z DS $
// RCS-ID: $Id: window_osx.cpp 67282 2011-03-22 16:39:26Z SC $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -298,7 +298,8 @@ void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer)
{
if ( GetPeer() )
{
GetPeer()->RemoveFromParent();
if ( !GetPeer()->IsRootControl() )
GetPeer()->RemoveFromParent();
wxDELETE(m_peer);
}