diff options
| author | hobbs <hobbs> | 1999-09-02 17:03:22 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 1999-09-02 17:03:22 (GMT) |
| commit | 73996d52f3222139f2789a89017704459534e839 (patch) | |
| tree | 6fdffdab6de9dd6b92752b9d8df7f6d10e396ecc /unix | |
| parent | 28656df2175564b486ec91a8e15e46ad54a9a432 (diff) | |
| download | tk-73996d52f3222139f2789a89017704459534e839.zip tk-73996d52f3222139f2789a89017704459534e839.tar.gz tk-73996d52f3222139f2789a89017704459534e839.tar.bz2 | |
* win/tkWinDraw.c:
* unix/tkUnixDraw.c: fixed header style for TkpDrawHighlightBorder
* generic/tkCanvas.c: fixed GC error (bg <> fg) in tkCanvas.c
(from code added to support TkpDrawHighlightBorder) [Bug: 2676]
* unix/aclocal.m4: added -bnoentry to the AIX-* flags
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/aclocal.m4 | 4 | ||||
| -rw-r--r-- | unix/tkUnixDraw.c | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/unix/aclocal.m4 b/unix/aclocal.m4 index eb24967..28b7796 100644 --- a/unix/aclocal.m4 +++ b/unix/aclocal.m4 @@ -563,7 +563,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ TCL_BUILD_EXP_FILE="" TCL_EXP_FILE="" case $system in - AIX-4.[[2-9]]) + AIX-4.[[1-9]]) SHLIB_CFLAGS="" SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry" SHLIB_LD_LIBS='${LIBS}' @@ -577,7 +577,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ ;; AIX-*) SHLIB_CFLAGS="" - SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512" + SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c index d7ac932..cc9f736 100644 --- a/unix/tkUnixDraw.c +++ b/unix/tkUnixDraw.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixDraw.c,v 1.4 1999/08/10 05:04:45 jingham Exp $ + * RCS: @(#) $Id: tkUnixDraw.c,v 1.5 1999/09/02 17:03:23 hobbs Exp $ */ #include "tkPort.h" @@ -172,7 +172,7 @@ ScrollRestrictProc(arg, eventPtr) } return TK_DISCARD_EVENT; } - + /* *---------------------------------------------------------------------- * @@ -196,13 +196,12 @@ ScrollRestrictProc(arg, eventPtr) */ void -TkpDrawHighlightBorder ( - Tk_Window tkwin, - GC fgGC, - GC bgGC, - int highlightWidth, - Drawable drawable) +TkpDrawHighlightBorder(tkwin, fgGC, bgGC, highlightWidth, drawable) + Tk_Window tkwin; + GC fgGC; + GC bgGC; + int highlightWidth; + Drawable drawable; { - TkDrawInsetFocusHighlight (tkwin, fgGC, highlightWidth, drawable, 0); + TkDrawInsetFocusHighlight(tkwin, fgGC, highlightWidth, drawable, 0); } - |