diff options
author | joye <joye> | 2014-03-20 21:52:57 (GMT) |
---|---|---|
committer | joye <joye> | 2014-03-20 21:52:57 (GMT) |
commit | 8fa61091702d473ae172da62256e323d53afe3e2 (patch) | |
tree | 2cb284ff58ddc50b471bbbfa5d4b5ff740a0f6e1 /src | |
parent | 6f109ea0c83eb24b1b31543041674578b551a552 (diff) | |
download | blt-8fa61091702d473ae172da62256e323d53afe3e2.zip blt-8fa61091702d473ae172da62256e323d53afe3e2.tar.gz blt-8fa61091702d473ae172da62256e323d53afe3e2.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r-- | src/bltGrElemOp.C | 9 | ||||
-rw-r--r-- | src/bltGrMarker.C | 5 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C index 52ad5ae..7047305 100644 --- a/src/bltGrElemOp.C +++ b/src/bltGrElemOp.C @@ -349,8 +349,6 @@ static void DestroyElement(Element* elemPtr) FreeDataValues(&elemPtr->x); FreeDataValues(&elemPtr->y); - (*elemPtr->procsPtr->destroyProc) (graphPtr, elemPtr); - /* Remove it also from the element display list */ if (elemPtr->link) { Blt_Chain_DeleteLink(graphPtr->elements.displayList, elemPtr->link); @@ -366,12 +364,9 @@ static void DestroyElement(Element* elemPtr) if (elemPtr->obj.name) free((void*)(elemPtr->obj.name)); - // to be freed via Tk_FreeConfigOptions - // if (elemPtr->label) - // free((void*)(elemPtr->label)); - Tk_FreeConfigOptions((char*)elemPtr, elemPtr->optionTable, graphPtr->tkwin); + (*elemPtr->procsPtr->destroyProc) (graphPtr, elemPtr); free(elemPtr); } @@ -1079,7 +1074,7 @@ static void FreeDataValues(ElemValues *valuesPtr) break; } if (valuesPtr->values) { - free(valuesPtr->values); + // free(valuesPtr->values); } valuesPtr->values = NULL; valuesPtr->nValues = 0; diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index e910d5e..b86e629 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -299,10 +299,6 @@ static void DestroyMarker(Marker *markerPtr) if (markerPtr->ops->drawUnder) graphPtr->flags |= CACHE_DIRTY; - // Call the marker's type-specific deallocation routine. We do it first - // while all the marker fields are still valid. - (*markerPtr->classPtr->freeProc)(markerPtr); - Blt_DeleteBindings(graphPtr->bindTable, markerPtr); if (markerPtr->obj.name) @@ -317,6 +313,7 @@ static void DestroyMarker(Marker *markerPtr) Tk_FreeConfigOptions((char*)markerPtr->ops, markerPtr->optionTable, graphPtr->tkwin); + (*markerPtr->classPtr->freeProc)(markerPtr); free(markerPtr); } |