From: Kevin Ollivier Date: Wed, 30 Dec 2009 23:40:01 +0000 (+0000) Subject: Fix issue that was causing ShowWithoutActivating to indirectly call wxNonOwnedWindow... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/598ad2b94d5bbd1ab4186350f4eeaf3fd27f1ee6 Fix issue that was causing ShowWithoutActivating to indirectly call wxNonOwnedWindow::Show. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/osx/toplevel_osx.cpp b/src/osx/toplevel_osx.cpp index 3b6f61c6a2..8abcfbab43 100644 --- a/src/osx/toplevel_osx.cpp +++ b/src/osx/toplevel_osx.cpp @@ -159,7 +159,9 @@ wxString wxTopLevelWindowMac::GetTitle() const void wxTopLevelWindowMac::ShowWithoutActivating() { - if ( !wxTopLevelWindowBase::Show(true) ) + // wxTopLevelWindowBase is derived from wxNonOwnedWindow, so don't + // call it here. + if ( !wxWindow::Show(true) ) return; m_nowpeer->ShowWithoutActivating();