diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixDefault.h | 2 | ||||
| -rw-r--r-- | unix/tkUnixMenubu.c | 2 | ||||
| -rw-r--r-- | unix/tkUnixScale.c | 2 | ||||
| -rw-r--r-- | unix/tkUnixScrlbr.c | 5 |
4 files changed, 4 insertions, 7 deletions
diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h index dfcf858..16fdcc6 100644 --- a/unix/tkUnixDefault.h +++ b/unix/tkUnixDefault.h @@ -448,7 +448,7 @@ #define DEF_SCROLLBAR_BORDER_WIDTH "1" #define DEF_SCROLLBAR_COMMAND "" #define DEF_SCROLLBAR_CURSOR "" -#define DEF_SCROLLBAR_EL_BORDER_WIDTH "-1" +#define DEF_SCROLLBAR_EL_BORDER_WIDTH NULL #define DEF_SCROLLBAR_HIGHLIGHT_BG NORMAL_BG #define DEF_SCROLLBAR_HIGHLIGHT BLACK #define DEF_SCROLLBAR_HIGHLIGHT_WIDTH "0" diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index dd67639..c9a33aa 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -279,7 +279,7 @@ TkpDisplayMenuButton( Tk_Height(tkwin) - 2*mbPtr->highlightWidth, mbPtr->borderWidth, mbPtr->relief); } - if (mbPtr->highlightWidth != 0) { + if (mbPtr->highlightWidth > 0) { if (mbPtr->flags & GOT_FOCUS) { gc = Tk_GCForColor(mbPtr->highlightColorPtr, pixmap); } else { diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c index 6e73268..8f4d23b 100644 --- a/unix/tkUnixScale.c +++ b/unix/tkUnixScale.c @@ -632,7 +632,7 @@ TkpDisplayScale( Tk_Height(tkwin) - 2*scalePtr->highlightWidth, scalePtr->borderWidth, scalePtr->relief); } - if (scalePtr->highlightWidth != 0) { + if (scalePtr->highlightWidth > 0) { GC gc; if (scalePtr->flags & GOT_FOCUS) { diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c index 9660718..65166e4 100644 --- a/unix/tkUnixScrlbr.c +++ b/unix/tkUnixScrlbr.c @@ -128,7 +128,7 @@ TkpDisplayScrollbar( pixmap = Tk_GetPixmap(scrollPtr->display, Tk_WindowId(tkwin), Tk_Width(tkwin), Tk_Height(tkwin), Tk_Depth(tkwin)); - if (scrollPtr->highlightWidth != 0) { + if (scrollPtr->highlightWidth > 0) { GC gc; if (scrollPtr->flags & GOT_FOCUS) { @@ -283,9 +283,6 @@ TkpComputeScrollbarGeometry( { int width, fieldLength; - if (scrollPtr->highlightWidth < 0) { - scrollPtr->highlightWidth = 0; - } scrollPtr->inset = scrollPtr->highlightWidth + scrollPtr->borderWidth; width = (scrollPtr->vertical) ? Tk_Width(scrollPtr->tkwin) : Tk_Height(scrollPtr->tkwin); |