diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-03-26 19:34:52 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-03-26 19:34:52 (GMT) |
| commit | 1c7088abb1b65b2bf0b5796351330c332c8cd6de (patch) | |
| tree | 088c646c237ef068fb74479c7d44cf2d48ba978b /unix/tkUnixCursor.c | |
| parent | 81b487a13cf938a65bb309aa132f60db67de7d27 (diff) | |
| download | tk-1c7088abb1b65b2bf0b5796351330c332c8cd6de.zip tk-1c7088abb1b65b2bf0b5796351330c332c8cd6de.tar.gz tk-1c7088abb1b65b2bf0b5796351330c332c8cd6de.tar.bz2 | |
* changes: Updates for 8.5.2 release.
* unix/tkUnixCursor.c: Stop crash in [. configure -cursor] on X11.
Thanks to emiliano gavilán. [Bug 1922466]
Diffstat (limited to 'unix/tkUnixCursor.c')
| -rw-r--r-- | unix/tkUnixCursor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c index 03bac45..d57db13 100644 --- a/unix/tkUnixCursor.c +++ b/unix/tkUnixCursor.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixCursor.c,v 1.12 2007/12/13 15:28:50 dgp Exp $ + * RCS: @(#) $Id: tkUnixCursor.c,v 1.13 2008/03/26 19:34:53 dgp Exp $ */ #include "tkInt.h" @@ -493,7 +493,7 @@ CreateCursorFromTableOrFile( * If there is no mask data, then create the cursor now. */ - if ((!inTkTable && (argc == 2)) || (tkCursorPtr->mask == NULL)) { + if ((!inTkTable && (argc == 2)) || (inTkTable && tkCursorPtr->mask == NULL)) { cursor = XCreatePixmapCursor(display, source, source, &fg, &fg, (unsigned) xHot, (unsigned) yHot); goto cleanup; @@ -532,7 +532,7 @@ CreateCursorFromTableOrFile( } } - if ((maskWidth != width) && (maskHeight != height)) { + if ((maskWidth != width) || (maskHeight != height)) { Tcl_SetResult(interp, "source and mask bitmaps have different sizes", TCL_STATIC); goto cleanup; |