summaryrefslogtreecommitdiffstats
path: root/generic/tkGrab.c
diff options
context:
space:
mode:
authordas <das@noemail.net>2009-06-29 14:35:01 (GMT)
committerdas <das@noemail.net>2009-06-29 14:35:01 (GMT)
commita6401db9ac290e17faaf7897ec75bf07ef5b743f (patch)
tree81b5743d2ff5d45f2ee4992153e4f34949ea8f8a /generic/tkGrab.c
parent26cb1dfcf18ed78319ed485346885111ef5c34ed (diff)
downloadtk-macosx-cocoa-merge.zip
tk-macosx-cocoa-merge.tar.gz
tk-macosx-cocoa-merge.tar.bz2
Merge of TkAqua Cocoa portmacosx-cocoa-merge
FossilOrigin-Name: 05bd0a2cb86bb730d85069b3282e569b6c23d911
Diffstat (limited to 'generic/tkGrab.c')
-rw-r--r--generic/tkGrab.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 1f80028..48bfcd6 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkGrab.c,v 1.18 2009/02/03 23:55:47 nijtmans Exp $
+ * RCS: @(#) $Id: tkGrab.c,v 1.19 2009/06/29 14:35:01 das Exp $
*/
#include "tkInt.h"
@@ -419,7 +419,12 @@ Tk_Grab(
}
Tk_MakeWindowExist(tkwin);
- if (!grabGlobal) {
+#ifndef MAC_OSX_TK
+ if (!grabGlobal)
+#else
+ if (0)
+#endif
+ {
Window dummy1, dummy2;
int dummy3, dummy4, dummy5, dummy6;
unsigned int state;