summaryrefslogtreecommitdiffstats
path: root/win/tkWinButton.c
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2019-03-31 14:43:09 (GMT)
committerfvogel <fvogelnew1@free.fr>2019-03-31 14:43:09 (GMT)
commita46a024f97912319754e4dae155b18f796b56b0d (patch)
tree0962794025edd0f21739435e9234b04fdb277926 /win/tkWinButton.c
parent8cf4a9bdbf03c6a9b09e09554c470e7f2e13abdf (diff)
downloadtk-a46a024f97912319754e4dae155b18f796b56b0d.zip
tk-a46a024f97912319754e4dae155b18f796b56b0d.tar.gz
tk-a46a024f97912319754e4dae155b18f796b56b0d.tar.bz2
*Really* don't change the behavior for *buttons, even with they have -default active
Diffstat (limited to 'win/tkWinButton.c')
-rw-r--r--win/tkWinButton.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index 6024b02..d03a391 100644
--- a/win/tkWinButton.c
+++ b/win/tkWinButton.c
@@ -762,11 +762,12 @@ TkpDisplayButton(
butPtr->borderWidth, relief);
}
if (defaultWidth != 0) {
- int highlightColor =
- (int) Tk_3DBorderColor(butPtr->highlightBorder)->pixel;
+ int highlightColor;
dc = TkWinGetDrawableDC(butPtr->display, pixmap, &state);
- if (butPtr->flags & GOT_FOCUS) {
+ if (butPtr->type == TYPE_LABEL) {
+ highlightColor = (int) Tk_3DBorderColor(butPtr->highlightBorder)->pixel;
+ } else {
highlightColor = (int) butPtr->highlightColorPtr->pixel;
}
TkWinFillRect(dc, 0, 0, Tk_Width(tkwin), defaultWidth,