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
This commit is contained in:
parent
e431dd05ae
commit
1f83c63111
@ -475,7 +475,12 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
|
|||||||
{
|
{
|
||||||
if ( 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];
|
[[m_macWindow contentView] setNeedsDisplay:YES];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user