diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-10-25 21:06:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-10-25 21:06:25 (GMT) |
| commit | 0d5336db012f45753abace489f18f0ca299c6961 (patch) | |
| tree | b1bf3280a9046df99226158978502eeb26f5b0a3 /macosx/tkMacOSXEntry.c | |
| parent | e97381a6d921de403516d5b761539a450f4af83c (diff) | |
| parent | 1320b8a2a9c1269a345d44d673a7a35707fbbe9c (diff) | |
| download | tk-core-tip-626.zip tk-core-tip-626.tar.gz tk-core-tip-626.tar.bz2 | |
Merge 9.0core-tip-626
Diffstat (limited to 'macosx/tkMacOSXEntry.c')
| -rw-r--r-- | macosx/tkMacOSXEntry.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c index 286a7fe..4579528 100644 --- a/macosx/tkMacOSXEntry.c +++ b/macosx/tkMacOSXEntry.c @@ -100,6 +100,7 @@ TkpDrawEntryBorderAndFocus( kThemeStateActive), .isFocused = (entryPtr->flags & GOT_FOCUS ? 1 : 0), }; + int borderWidth, highlightWidth; /* * I use 6 as the borderwidth. 2 of the 5 go into the actual frame the 3 @@ -107,8 +108,10 @@ TkpDrawEntryBorderAndFocus( * than Tk does on X11. */ - if (entryPtr->borderWidth != MAC_OSX_ENTRY_BORDER - || entryPtr->highlightWidth != MAC_OSX_FOCUS_WIDTH + Tk_GetPixelsFromObj(NULL, tkwin, entryPtr->borderWidthObj, &borderWidth); + Tk_GetPixelsFromObj(NULL, tkwin, entryPtr->highlightWidthObj, &highlightWidth); + if (borderWidth != MAC_OSX_ENTRY_BORDER + || highlightWidth != MAC_OSX_FOCUS_WIDTH || entryPtr->relief != MAC_OSX_ENTRY_RELIEF) { return 0; } |