diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-09-25 15:05:47 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-09-25 15:05:47 (GMT) |
| commit | e6a381f7346af7c42d6a08d75737cbf7ca2d50eb (patch) | |
| tree | ea6f0d315ca7b038113fc74213a54ee872fca82a /unix | |
| parent | b5942485c76bfda6223b6c9eaec84813e6d2e3f9 (diff) | |
| parent | c2eaef98e73b309df7c2e262fc0c982a634d0f9d (diff) | |
| download | tk-e6a381f7346af7c42d6a08d75737cbf7ca2d50eb.zip tk-e6a381f7346af7c42d6a08d75737cbf7ca2d50eb.tar.gz tk-e6a381f7346af7c42d6a08d75737cbf7ca2d50eb.tar.bz2 | |
merge 8.6
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixColor.c | 2 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c index ccc6f33..512b20c 100644 --- a/unix/tkUnixColor.c +++ b/unix/tkUnixColor.c @@ -85,7 +85,7 @@ TkpFreeColor( */ visual = tkColPtr->visual; - if ((visual->class != StaticGray) && (visual->class != StaticColor) + if ((visual->c_class != StaticGray) && (visual->c_class != StaticColor) && (tkColPtr->color.pixel != BlackPixelOfScreen(screen)) && (tkColPtr->color.pixel != WhitePixelOfScreen(screen))) { Tk_ErrorHandler handler; diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index f09b59c..bc7f1cb 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -980,18 +980,18 @@ TkWmSetClass( if (winPtr->classUid != NULL) { XClassHint *classPtr; - Tcl_DString name, class; + Tcl_DString name, ds; Tcl_UtfToExternalDString(NULL, winPtr->nameUid, -1, &name); - Tcl_UtfToExternalDString(NULL, winPtr->classUid, -1, &class); + Tcl_UtfToExternalDString(NULL, winPtr->classUid, -1, &ds); classPtr = XAllocClassHint(); classPtr->res_name = Tcl_DStringValue(&name); - classPtr->res_class = Tcl_DStringValue(&class); + classPtr->res_class = Tcl_DStringValue(&ds); XSetClassHint(winPtr->display, winPtr->wmInfoPtr->wrapperPtr->window, classPtr); XFree((char *) classPtr); Tcl_DStringFree(&name); - Tcl_DStringFree(&class); + Tcl_DStringFree(&ds); } } |