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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index de474588265978c3a809bd00dd84c26620e6ff9e..6e617f9bfdbb6a81983d20f1a4705700e75f96ff 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -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];
     }
     else
         [[m_macWindow contentView] setNeedsDisplay:YES];
     }
     else