diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-14 12:59:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-14 12:59:56 (GMT) |
| commit | c8d797e64f30f341f39bb2d24cb557342ab182cd (patch) | |
| tree | 97904217c85d2d0508c7823ed0f4e5f8a42bd671 /generic/ttk | |
| parent | 9dd438cc2c26863bb963e9e6fad660ad9a2ad605 (diff) | |
| parent | 384e8936ee8f4826db8273ae8423213c0aa59e45 (diff) | |
| download | tk-c8d797e64f30f341f39bb2d24cb557342ab182cd.zip tk-c8d797e64f30f341f39bb2d24cb557342ab182cd.tar.gz tk-c8d797e64f30f341f39bb2d24cb557342ab182cd.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/ttk')
| -rw-r--r-- | generic/ttk/ttkImage.c | 9 | ||||
| -rw-r--r-- | generic/ttk/ttkLabel.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkTheme.h | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c index 5c5ae10..b959165 100644 --- a/generic/ttk/ttkImage.c +++ b/generic/ttk/ttkImage.c @@ -165,7 +165,10 @@ void TtkFreeImageSpec(Ttk_ImageSpec *imageSpec) /* TtkSelectImage -- * Return a state-specific image from an ImageSpec */ -Tk_Image TtkSelectImage(Ttk_ImageSpec *imageSpec, Ttk_State state) +Tk_Image TtkSelectImage( + Ttk_ImageSpec *imageSpec, + TCL_UNUSED(Tk_Window), + Ttk_State state) { int i; for (i = 0; i < imageSpec->mapCount; ++i) { @@ -320,10 +323,10 @@ static void ImageElementDraw( } } if (!image) { - image = TtkSelectImage(imageData->imageSpec, state); + image = TtkSelectImage(imageData->imageSpec, tkwin, state); } #else - image = TtkSelectImage(imageData->imageSpec, state); + image = TtkSelectImage(imageData->imageSpec, tkwin, state); #endif if (!image) { diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c index d94cb23..9e09195 100644 --- a/generic/ttk/ttkLabel.c +++ b/generic/ttk/ttkLabel.c @@ -336,7 +336,7 @@ static int ImageSetup( if (!image->imageSpec) { return 0; } - image->tkimg = TtkSelectImage(image->imageSpec, state); + image->tkimg = TtkSelectImage(image->imageSpec, tkwin, state); if (!image->tkimg) { TtkFreeImageSpec(image->imageSpec); return 0; @@ -410,7 +410,7 @@ static void ImageDraw( if (state & TTK_STATE_DISABLED) { - if (TtkSelectImage(image->imageSpec, 0ul) == image->tkimg) { + if (TtkSelectImage(image->imageSpec, tkwin, 0ul) == image->tkimg) { #ifndef MAC_OSX_TK StippleOver(image, tkwin, d, b.x,b.y); #endif diff --git a/generic/ttk/ttkTheme.h b/generic/ttk/ttkTheme.h index a00dbc5..a5ae350 100644 --- a/generic/ttk/ttkTheme.h +++ b/generic/ttk/ttkTheme.h @@ -335,7 +335,7 @@ TTKAPI Ttk_ImageSpec *TtkGetImageSpec(Tcl_Interp *, Tk_Window, Tcl_Obj *); TTKAPI Ttk_ImageSpec *TtkGetImageSpecEx(Tcl_Interp *, Tk_Window, Tcl_Obj *, Tk_ImageChangedProc *, void *); TTKAPI void TtkFreeImageSpec(Ttk_ImageSpec *); -TTKAPI Tk_Image TtkSelectImage(Ttk_ImageSpec *, Ttk_State); +TTKAPI Tk_Image TtkSelectImage(Ttk_ImageSpec *, Tk_Window, Ttk_State); /*------------------------------------------------------------------------ * +++ Miscellaneous enumerations. |