diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-16 09:03:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-16 09:03:33 (GMT) |
| commit | 520853aabbe489eadcf8079f0ea0c3324104cbb4 (patch) | |
| tree | 0480204dad9d47875fba51f00b8200e0c01afa4f /generic/ttk | |
| parent | 2892911efe9a8315d8df90a20083df8ed188e5a8 (diff) | |
| parent | 2d5bd258efa4930673224605e1bd76b0badcef46 (diff) | |
| download | tk-520853aabbe489eadcf8079f0ea0c3324104cbb4.zip tk-520853aabbe489eadcf8079f0ea0c3324104cbb4.tar.gz tk-520853aabbe489eadcf8079f0ea0c3324104cbb4.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/ttk')
| -rw-r--r-- | generic/ttk/ttkImage.c | 2 | ||||
| -rw-r--r-- | generic/ttk/ttkProgress.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c index 634ba63..56b15f2 100644 --- a/generic/ttk/ttkImage.c +++ b/generic/ttk/ttkImage.c @@ -25,7 +25,7 @@ struct TtkImageSpec { Ttk_StateSpec *states; /* array[mapCount] of states ... */ Tk_Image *images; /* ... per-state images to use */ Tk_ImageChangedProc *imageChanged; - ClientData imageChangedClientData; + void *imageChangedClientData; }; /* NullImageChanged -- diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c index 50f786a..bbc8df2 100644 --- a/generic/ttk/ttkProgress.c +++ b/generic/ttk/ttkProgress.c @@ -74,7 +74,7 @@ static const Tk_OptionSpec ProgressbarOptionSpecs[] = 0, ProgressbarModeStrings, 0 }, {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal", offsetof(Progressbar,progress.orientObj), TCL_INDEX_NONE, - 0, (void *)ttkOrientStrings, STYLE_CHANGED }, + 0, ttkOrientStrings, STYLE_CHANGED }, {TK_OPTION_INT, "-phase", "phase", "Phase", "0", offsetof(Progressbar,progress.phaseObj), TCL_INDEX_NONE, 0, 0, 0 }, |