From 1f83c63111596f19a2247e1d1be0eb96b8dc5ddc Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 24 Sep 2009 09:46:00 +0000 Subject: [PATCH] no focus on Show for toolwindows, closes #10872 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/nonownedwnd.mm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index de47458826..6e617f9bfd 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -475,7 +475,12 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show) { if ( show ) { - [m_macWindow makeKeyAndOrderFront:nil]; + wxNonOwnedWindow* wxpeer = GetWXPeer(); + if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) + [m_macWindow makeKeyAndOrderFront:nil]; + else + [m_macWindow orderFront:nil]; + [[m_macWindow contentView] setNeedsDisplay:YES]; } else