diff options
| -rwxr-xr-x | configure | 46 | ||||
| -rwxr-xr-x | configure.in | 46 | ||||
| -rw-r--r-- | src/bltGrLegd.C | 8 | ||||
| -rw-r--r-- | src/bltGrMisc.C | 2 |
4 files changed, 51 insertions, 51 deletions
@@ -5527,35 +5527,35 @@ done vars=" bltBind.C - bltBitmap.c - bltChain.c - bltConfig.c - bltGrAxis.c - bltGrBar.c - bltGrElem.c - bltGrHairs.c - bltGrLegd.c - bltGrLine.c + bltBitmap.C + bltChain.C + bltConfig.C + bltGrAxis.C + bltGrBar.C + bltGrElem.C + bltGrHairs.C + bltGrLegd.C + bltGrLine.C bltGrMarker.C bltGrMarkerBitmap.C bltGrMarkerLine.C bltGrMarkerPolygon.C bltGrMarkerText.C bltGrMarkerWindow.C - bltGrMisc.c - bltGrPen.c - bltGrPs.c - bltGraph.c - bltInt.c - bltList.c - bltNsUtil.c - bltParse.c - bltPs.c - bltPsAfm.c - bltSpline.c - bltSwitch.c - bltText.c - bltUtil.c + bltGrMisc.C + bltGrPen.C + bltGrPs.C + bltGraph.C + bltInt.C + bltList.C + bltNsUtil.C + bltParse.C + bltPs.C + bltPsAfm.C + bltSpline.C + bltSwitch.C + bltText.C + bltUtil.C bltVecCmd.c bltVecMath.c bltVector.c diff --git a/configure.in b/configure.in index 619f066..09a43e5 100755 --- a/configure.in +++ b/configure.in @@ -72,35 +72,35 @@ TEA_SETUP_COMPILER #----------------------------------------------------------------------- TEA_ADD_SOURCES([ bltBind.C - bltBitmap.c - bltChain.c - bltConfig.c - bltGrAxis.c - bltGrBar.c - bltGrElem.c - bltGrHairs.c - bltGrLegd.c - bltGrLine.c + bltBitmap.C + bltChain.C + bltConfig.C + bltGrAxis.C + bltGrBar.C + bltGrElem.C + bltGrHairs.C + bltGrLegd.C + bltGrLine.C bltGrMarker.C bltGrMarkerBitmap.C bltGrMarkerLine.C bltGrMarkerPolygon.C bltGrMarkerText.C bltGrMarkerWindow.C - bltGrMisc.c - bltGrPen.c - bltGrPs.c - bltGraph.c - bltInt.c - bltList.c - bltNsUtil.c - bltParse.c - bltPs.c - bltPsAfm.c - bltSpline.c - bltSwitch.c - bltText.c - bltUtil.c + bltGrMisc.C + bltGrPen.C + bltGrPs.C + bltGraph.C + bltInt.C + bltList.C + bltNsUtil.C + bltParse.C + bltPs.C + bltPsAfm.C + bltSpline.C + bltSwitch.C + bltText.C + bltUtil.C bltVecCmd.c bltVecMath.c bltVector.c diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C index 6584076..b17db45 100644 --- a/src/bltGrLegd.C +++ b/src/bltGrLegd.C @@ -252,7 +252,7 @@ static int PositionSetProc(ClientData clientData, Tcl_Interp* interp, long x, y; int result; - comma = strchr(string + 1, ','); + comma = (char*)strchr(string + 1, ','); if (comma == NULL) { Tcl_AppendResult(interp, "bad screen position \"", string, "\": should be @x,y", (char *)NULL); @@ -1410,10 +1410,10 @@ void Blt_MapLegend(Graph* graphPtr, int plotWidth, int plotHeight) continue; /* Element has no legend entry. */ } Blt_Ts_GetExtents(&legendPtr->style, elemPtr->label, &w, &h); - if (maxWidth < w) { + if (maxWidth < (int)w) { maxWidth = w; } - if (maxHeight < h) { + if (maxHeight < (int)h) { maxHeight = h; } nEntries++; @@ -1493,7 +1493,7 @@ void Blt_MapLegend(Graph* graphPtr, int plotWidth, int plotHeight) lh += legendPtr->titleHeight + legendPtr->yPad; } lw = nColumns * maxWidth; - if (lw < legendPtr->titleWidth) { + if (lw < (int)(legendPtr->titleWidth)) { lw = legendPtr->titleWidth; } legendPtr->width = lw + 2 * legendPtr->borderWidth + diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index c01f2db..59d26f3 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -55,7 +55,7 @@ int Blt_GetXY(Tcl_Interp* interp, Tk_Window tkwin, const char* string, if (*string != '@') { goto badFormat; } - comma = strchr(string + 1, ','); + comma = (char*)strchr(string + 1, ','); if (comma == NULL) { goto badFormat; } |