From 2666723bd046870c0f25180f27ea5aaef37156ad Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 27 Nov 2006 11:33:54 +0000 Subject: [PATCH] OS X: Cmd-click on titlebar and resize area do not bring a window forward svn: r4959 --- src/mred/mredmac.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mred/mredmac.cxx b/src/mred/mredmac.cxx index 0ec1485555..1ed4c23479 100644 --- a/src/mred/mredmac.cxx +++ b/src/mred/mredmac.cxx @@ -757,13 +757,15 @@ static int CheckForMouseOrKey(EventRecord *e, MrQueueRef osq, int check_only, /* Handle bring-window-to-front click immediately */ if (!osq->half_done) { if (fc && (!fc->modal_window || (fr == fc->modal_window))) { - SelectWindow(window); + if ((part == inContent) || !(e->modifiers & cmdKey)) + SelectWindow(window); cont_mouse_context = NULL; } else if (fc && fc->modal_window) { wxFrame *mfr; mfr = (wxFrame *)fc->modal_window; cont_mouse_context = NULL; - SelectWindow(mfr->macWindow()); + if ((part == inContent) || !(e->modifiers & cmdKey)) + SelectWindow(mfr->macWindow()); } osq->half_done = 1; }