summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--macosx/tkMacOSXWm.c22
2 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index f2500ba..cf246a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,7 +38,7 @@
* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): allow mouse
event delivery to background windows with kWindowNoActivatesAttribute
(e.g. overrideredirect windows), as these never come to the foreground
- they would not receive any mouse events otherwise. [Bug 1472624]
+ they would never receive any mouse events otherwise. [Bug 1472624]
* macosx/tkMacOSXWindowEvent.c (TkMacOSXGenerateFocusEvent): do not
send focus events to any windows with kWindowNoActivatesAttribute.
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index fcb2040..16f9da9 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.33 2006/09/11 14:41:17 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.34 2006/09/11 16:12:58 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -5800,15 +5800,19 @@ ApplyWindowAttributeChanges(TkWindow *winPtr, int newAttributes,
int oldAttributes, int create)
{
if (newAttributes != oldAttributes) {
- if (winPtr->window == None && create) {
- Tk_MakeWindowExist((Tk_Window) winPtr);
- } else {
- return;
+ if (winPtr->window == None) {
+ if (create) {
+ Tk_MakeWindowExist((Tk_Window) winPtr);
+ } else {
+ return;
+ }
}
- if (!TkMacOSXHostToplevelExists(winPtr) && create) {
- TkMacOSXMakeRealWindowExist(winPtr);
- } else {
- return;
+ if (!TkMacOSXHostToplevelExists(winPtr)) {
+ if (create) {
+ TkMacOSXMakeRealWindowExist(winPtr);
+ } else {
+ return;
+ }
}
ChangeWindowAttributes(
GetWindowFromPort(TkMacOSXGetDrawablePort(winPtr->window)),