diff options
| author | joye <joye> | 2014-02-20 21:25:42 (GMT) |
|---|---|---|
| committer | joye <joye> | 2014-02-20 21:25:42 (GMT) |
| commit | 85d33eb68078b0ac07acf782f957453c2462ab50 (patch) | |
| tree | ec940230238172a48b3c33c4918c5d4a2b47650d /src | |
| parent | fd0b5e8aa99e737f5b5df3d66c7dd9c5a2b87f92 (diff) | |
| download | blt-85d33eb68078b0ac07acf782f957453c2462ab50.zip blt-85d33eb68078b0ac07acf782f957453c2462ab50.tar.gz blt-85d33eb68078b0ac07acf782f957453c2462ab50.tar.bz2 | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/bltGrElemLine.C | 12 | ||||
| -rw-r--r-- | src/bltGrText.C | 5 | ||||
| -rw-r--r-- | src/bltGrText.h | 1 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index 35ec175..c433bf1 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -1385,7 +1385,7 @@ static void InitLinePen(LinePen *penPtr) { Blt_Ts_InitStyle(penPtr->valueStyle); - penPtr->errorBarLineWidth = 2; + penPtr->errorBarLineWidth = 1; penPtr->errorBarShow = SHOW_BOTH; penPtr->configProc = ConfigurePenProc; penPtr->configSpecs = linePenConfigSpecs; @@ -4125,6 +4125,9 @@ DrawValues(Graph *graphPtr, Drawable drawable, LineElement *elemPtr, } count = 0; xval = elemPtr->x.values, yval = elemPtr->y.values; + + // be sure to update style->gc, things might have changed + penPtr->valueStyle.flags |= UPDATE_GC; for (pp = points, endp = points + length; pp < endp; pp++) { double x, y; @@ -4580,10 +4583,9 @@ TracesToPostScript(Blt_Ps ps, LineElement *elemPtr, LinePen *penPtr) } } - -static void -ValuesToPostScript(Blt_Ps ps, LineElement *elemPtr, LinePen *penPtr, - int nSymbolPts, Point2d *symbolPts, int *pointToData) +static void ValuesToPostScript(Blt_Ps ps, LineElement *elemPtr, LinePen *penPtr, + int nSymbolPts, Point2d *symbolPts, + int *pointToData) { Point2d *pp, *endp; int count; diff --git a/src/bltGrText.C b/src/bltGrText.C index 5f8a473..5e853d9 100644 --- a/src/bltGrText.C +++ b/src/bltGrText.C @@ -417,7 +417,7 @@ void Blt_Ts_ResetStyle(Tk_Window tkwin, TextStyle *stylePtr) GC newGC; XGCValues gcValues; unsigned long gcMask; - + gcMask = GCFont; gcValues.font = Tk_FontId(stylePtr->font); if (stylePtr->color != NULL) { @@ -425,9 +425,8 @@ void Blt_Ts_ResetStyle(Tk_Window tkwin, TextStyle *stylePtr) gcValues.foreground = stylePtr->color->pixel; } newGC = Tk_GetGC(tkwin, gcMask, &gcValues); - if (stylePtr->gc != NULL) { + if (stylePtr->gc != NULL) Tk_FreeGC(Tk_Display(tkwin), stylePtr->gc); - } stylePtr->gc = newGC; stylePtr->flags &= ~UPDATE_GC; diff --git a/src/bltGrText.h b/src/bltGrText.h index ff71ada..069eccc 100644 --- a/src/bltGrText.h +++ b/src/bltGrText.h @@ -103,7 +103,6 @@ extern void Blt_Ts_DrawText(Tk_Window tkwin, Drawable drawable, (((ts).font != (f)) ? ((ts).font = (f), (ts).flags |= UPDATE_GC) : 0) #define Blt_Ts_SetForeground(ts, c) \ (((ts).color != (c)) ? ((ts).color = (c), (ts).flags |= UPDATE_GC) : 0) -#define Blt_Ts_SetGC(ts, g) ((ts).gc = (g)) #define Blt_Ts_SetJustify(ts, j) ((ts).justify = (j)) #define Blt_Ts_SetLeader(ts, l) ((ts).leader = (l)) #define Blt_Ts_SetMaxLength(ts, l) ((ts).maxLength = (l)) |