diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-09-02 13:51:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-09-02 13:51:00 (GMT) |
| commit | cf61ac364550b41e29306428d3423420b743943c (patch) | |
| tree | a73a4283a1c95a171c6f7885c32b3c0cc314b422 /win | |
| parent | 13d9114a51d1c63fb18d21d2abe4cade17b13612 (diff) | |
| parent | 3d16dc9d8da782d7095e058e2415e47ac96a1ac9 (diff) | |
| download | tk-cf61ac364550b41e29306428d3423420b743943c.zip tk-cf61ac364550b41e29306428d3423420b743943c.tar.gz tk-cf61ac364550b41e29306428d3423420b743943c.tar.bz2 | |
Undo experiment. Merge 9.0
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinDefault.h | 2 | ||||
| -rw-r--r-- | win/tkWinDialog.c | 2 | ||||
| -rw-r--r-- | win/tkWinWm.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h index 5af7877..9f546de 100644 --- a/win/tkWinDefault.h +++ b/win/tkWinDefault.h @@ -492,7 +492,7 @@ #define DEF_TEXT_PADX "1" #define DEF_TEXT_PADY "1" #define DEF_TEXT_RELIEF "sunken" -#define DEF_TEXT_INACTIVE_SELECT_COLOR NULL +#define DEF_TEXT_INACTIVE_SELECT_BG_COLOR NULL #define DEF_TEXT_SELECT_COLOR SELECT_BG #define DEF_TEXT_SELECT_MONO BLACK #define DEF_TEXT_SELECT_BD_COLOR "0" diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 0b0494b..efd3a4b 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -760,7 +760,7 @@ Tk_ChooseColorObjCmd( case COLOR_INITIAL: { XColor *colorPtr; - colorPtr = Tk_GetColor(interp, tkwin, string); + colorPtr = Tk_AllocColorFromObj(interp, tkwin, valuePtr); if (colorPtr == NULL) { return TCL_ERROR; } diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 8aef4fa..c2d1683 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -3070,7 +3070,7 @@ WmAttributesCmd( } wmPtr->alpha = dval; } else { /* -transparentcolor */ - const char *crefstr = Tcl_GetStringFromObj(objv[i+1], &length); + (void)Tcl_GetStringFromObj(objv[i+1], &length); if (length == 0) { /* reset to no transparent color */ @@ -3080,7 +3080,7 @@ WmAttributesCmd( } } else { XColor *cPtr = - Tk_GetColor(interp, tkwin, crefstr); + Tk_AllocColorFromObj(interp, tkwin, objv[i+1]); if (cPtr == NULL) { return TCL_ERROR; } |