diff options
| -rw-r--r-- | src/bltGrElem.C | 4 | ||||
| -rw-r--r-- | src/bltGrElem.h | 4 | ||||
| -rw-r--r-- | src/bltGrElemBar.C | 2 | ||||
| -rw-r--r-- | src/bltGrElemLine.C | 8 | ||||
| -rw-r--r-- | src/bltGrElemLine.h | 2 | ||||
| -rw-r--r-- | src/bltGrElemOption.C | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/bltGrElem.C b/src/bltGrElem.C index d98267f..2cc7ba9 100644 --- a/src/bltGrElem.C +++ b/src/bltGrElem.C @@ -134,13 +134,13 @@ PenStyle** Element::StyleMap() return dataToStyle; } -void Blt_FreeStylePalette(Blt_Chain stylePalette) +void Element::freeStylePalette(Blt_Chain stylePalette) { // Skip the first slot. It contains the built-in "normal" pen of the element Blt_ChainLink link = Blt_Chain_FirstLink(stylePalette); if (link) { Blt_ChainLink next; - for (link = Blt_Chain_NextLink(link); link != NULL; link = next) { + for (link=Blt_Chain_NextLink(link); link; link=next) { next = Blt_Chain_NextLink(link); PenStyle *stylePtr = (PenStyle*)Blt_Chain_GetValue(link); Pen* penPtr = stylePtr->penPtr; diff --git a/src/bltGrElem.h b/src/bltGrElem.h index 8f5a645..e778df7 100644 --- a/src/bltGrElem.h +++ b/src/bltGrElem.h @@ -161,11 +161,11 @@ namespace Blt { virtual const char* className() =0; virtual const char* typeName() =0; + void freeStylePalette (Blt_Chain); + Tk_OptionTable optionTable() {return optionTable_;} void* ops() {return ops_;} }; }; -extern void Blt_FreeStylePalette (Blt_Chain stylePalette); - #endif diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C index 977635d..16a9b8d 100644 --- a/src/bltGrElemBar.C +++ b/src/bltGrElemBar.C @@ -220,7 +220,7 @@ BarElement::~BarElement() reset(); if (ops->stylePalette) { - Blt_FreeStylePalette(ops->stylePalette); + freeStylePalette(ops->stylePalette); Blt_Chain_Destroy(ops->stylePalette); } } diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index 358006e..36e7193 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -268,10 +268,10 @@ LineElement::~LineElement() if (builtinPenPtr) delete builtinPenPtr; - resetLine(); + reset(); if (ops->stylePalette) { - Blt_FreeStylePalette(ops->stylePalette); + freeStylePalette(ops->stylePalette); Blt_Chain_Destroy(ops->stylePalette); } @@ -306,7 +306,7 @@ void LineElement::map() if (!link) return; - resetLine(); + reset(); if (!ops->coords.x || !ops->coords.y || !ops->coords.x->nValues || !ops->coords.y->nValues) return; @@ -1683,7 +1683,7 @@ void LineElement::mapFillArea(MapInfo *mapPtr) } } -void LineElement::resetLine() +void LineElement::reset() { LineElementOptions* ops = (LineElementOptions*)ops_; diff --git a/src/bltGrElemLine.h b/src/bltGrElemLine.h index 30f5c50..42e2504 100644 --- a/src/bltGrElemLine.h +++ b/src/bltGrElemLine.h @@ -139,7 +139,7 @@ namespace Blt { void mapTraces(MapInfo*); void mapFillArea(MapInfo*); void mapErrorBars(LineStyle**); - void resetLine(); + void reset(); int closestTrace(); void closestPoint(ClosestSearch*); void drawSymbols(Drawable, LinePen*, int, int, Point2d*); diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C index fa77102..38c1a4b 100644 --- a/src/bltGrElemOption.C +++ b/src/bltGrElemOption.C @@ -277,7 +277,7 @@ int StyleSetProc(ClientData clientData, Tcl_Interp* interp, return TCL_ERROR; // Reserve the first entry for the "normal" pen. We'll set the style later - Blt_FreeStylePalette(stylePalette); + elemPtr->freeStylePalette(stylePalette); Blt_ChainLink link = Blt_Chain_FirstLink(stylePalette); if (!link) { link = Blt_Chain_AllocLink(size); @@ -295,7 +295,7 @@ int StyleSetProc(ClientData clientData, Tcl_Interp* interp, if (GetPenStyleFromObj(interp, elemPtr->graphPtr_, objv[ii], elemPtr->classId(), (PenStyle*)stylePtr) != TCL_OK) { - Blt_FreeStylePalette(stylePalette); + elemPtr->freeStylePalette(stylePalette); return TCL_ERROR; } Blt_Chain_LinkAfter(stylePalette, link, NULL); |