summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordas <das>2006-09-11 16:12:39 (GMT)
committerdas <das>2006-09-11 16:12:39 (GMT)
commit99fe37369df762225eb9e364c9a5fb74c1c03a4b (patch)
treebf4ee8b62cfbefe42d6efac4d309b8a1bb774308 /macosx
parent165a8b48f80b1a778723600317777204d52a5186 (diff)
downloadtk-99fe37369df762225eb9e364c9a5fb74c1c03a4b.zip
tk-99fe37369df762225eb9e364c9a5fb74c1c03a4b.tar.gz
tk-99fe37369df762225eb9e364c9a5fb74c1c03a4b.tar.bz2
fix logic bug in previous commit
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXWm.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 65e7833..d5d7166 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.42 2006/09/11 14:41:04 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.43 2006/09/11 16:12:39 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -5892,15 +5892,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)),