diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/aclocal.m4 | 3 | ||||
| -rw-r--r-- | unix/configure.in | 4 | ||||
| -rw-r--r-- | unix/tkUnixFont.c | 5 | ||||
| -rw-r--r-- | unix/tkUnixMenu.c | 10 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 11 |
5 files changed, 19 insertions, 14 deletions
diff --git a/unix/aclocal.m4 b/unix/aclocal.m4 index d40e855..317d2a9 100644 --- a/unix/aclocal.m4 +++ b/unix/aclocal.m4 @@ -565,6 +565,9 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ TCL_EXP_FILE="" case $system in AIX-4.[[2-9]]) + # The IBM compiler has a bug with -O when compiling the + # text widget code (TkTextPixelIndex segv) + CFLAGS_OPTIMIZE="" SHLIB_CFLAGS="" SHLIB_LD=$TCL_SHLIB_LD SHLIB_LD_LIBS='${LIBS}' diff --git a/unix/configure.in b/unix/configure.in index ac94a31..da4382a 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,12 +3,12 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. AC_INIT(../generic/tk.h) -# RCS: @(#) $Id: configure.in,v 1.42 1999/10/01 22:45:28 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.43 1999/12/21 23:56:33 hobbs Exp $ TK_VERSION=8.3 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=3 -TK_PATCH_LEVEL="a1" +TK_PATCH_LEVEL="b1" VERSION=${TK_VERSION} if test "${prefix}" = "NONE"; then diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c index 5ededc3..59826c2 100644 --- a/unix/tkUnixFont.c +++ b/unix/tkUnixFont.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixFont.c,v 1.7 1999/06/01 18:44:56 stanton Exp $ + * RCS: @(#) $Id: tkUnixFont.c,v 1.8 1999/12/21 23:56:34 hobbs Exp $ */ #include "tkUnixInt.h" @@ -339,7 +339,7 @@ ControlUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen, * correspond to the bytes stored in the * output buffer. */ { - CONST char *srcStart, *srcEnd; + CONST char *srcEnd; char *dstStart, *dstEnd; Tcl_UniChar ch; int result; @@ -351,7 +351,6 @@ ControlUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen, result = TCL_OK; - srcStart = src; srcEnd = src + srcLen; dstStart = dst; diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c index 1a499cc..cf392e4 100644 --- a/unix/tkUnixMenu.c +++ b/unix/tkUnixMenu.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: tkUnixMenu.c,v 1.3 1999/04/16 01:51:46 stanton Exp $ + * RCS: @(#) $Id: tkUnixMenu.c,v 1.4 1999/12/21 23:56:34 hobbs Exp $ */ #include "tkPort.h" @@ -658,14 +658,12 @@ DrawMenuSeparator(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y, width, height) int height; { XPoint points[2]; - int margin; Tk_3DBorder border; if (menuPtr->menuType == MENUBAR) { return; } - margin = (fmPtr->ascent + fmPtr->descent)/2; points[0].x = x; points[0].y = y + height/2; points[1].x = width - 1; @@ -936,7 +934,7 @@ TkpComputeMenubarGeometry(menuPtr) Tk_FontMetrics menuMetrics, entryMetrics, *fmPtr; int width, height; int i, j; - int x, y, currentRowHeight, currentRowWidth, maxWidth; + int x, y, currentRowHeight, maxWidth; int maxWindowWidth; int lastRowBreak; int helpMenuIndex = -1; @@ -969,7 +967,6 @@ TkpComputeMenubarGeometry(menuPtr) &borderWidth); x = y = borderWidth; lastRowBreak = 0; - currentRowWidth = 0; /* * On the Mac especially, getting font metrics can be quite slow, @@ -1135,14 +1132,13 @@ DrawTearoffEntry(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y, width, height) int height; { XPoint points[2]; - int margin, segmentWidth, maxX; + int segmentWidth, maxX; Tk_3DBorder border; if (menuPtr->menuType != MASTER_MENU) { return; } - margin = (fmPtr->ascent + fmPtr->descent)/2; points[0].x = x; points[0].y = y + height/2; points[1].y = points[0].y; diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index c87fe53..b4ea55d 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixWm.c,v 1.4 1999/04/16 01:51:47 stanton Exp $ + * RCS: @(#) $Id: tkUnixWm.c,v 1.5 1999/12/21 23:56:34 hobbs Exp $ */ #include "tkPort.h" @@ -3490,6 +3490,7 @@ Tk_CoordsToWindow(rootX, rootY, tkwin) WmInfo *wmPtr; TkWindow *winPtr, *childPtr, *nextPtr; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; + Tk_ErrorHandler handler; /* * Step 1: scan the list of toplevel windows to see if there is a @@ -3528,12 +3529,17 @@ Tk_CoordsToWindow(rootX, rootY, tkwin) * the toplevel. */ + handler = Tk_CreateErrorHandler(Tk_Display(tkwin), -1, -1, -1, + (Tk_ErrorProc *) NULL, (ClientData) NULL); while (1) { if (XTranslateCoordinates(Tk_Display(tkwin), parent, window, x, y, &childX, &childY, &child) == False) { - panic("Tk_CoordsToWindow got False return from XTranslateCoordinates"); + fprintf (stderr, "Tk_CoordsToWindow got False return from XTranslateCoordinates\n"); + fflush (stderr); + return NULL; } if (child == None) { + Tk_DeleteErrorHandler(handler); return NULL; } for (wmPtr = (WmInfo *) dispPtr->firstWmPtr; wmPtr != NULL; @@ -3556,6 +3562,7 @@ Tk_CoordsToWindow(rootX, rootY, tkwin) } gotToplevel: + Tk_DeleteErrorHandler(handler); winPtr = wmPtr->winPtr; if (winPtr->mainPtr != ((TkWindow *) tkwin)->mainPtr) { return NULL; |