From d16057ce9fa899aa11c3ada8c80c35a4ce6e22da Mon Sep 17 00:00:00 2001 From: joye Date: Thu, 27 Mar 2014 21:13:04 +0000 Subject: *** empty log message *** --- bltGrMarkerBitmap.C | 19 ------------------- src/bltGrMarker.C | 39 ++------------------------------------- src/bltGrMarker.h | 2 -- src/bltGrMarkerLine.C | 18 ------------------ src/bltGrMarkerPolygon.C | 27 --------------------------- src/bltGrMarkerText.C | 15 --------------- 6 files changed, 2 insertions(+), 118 deletions(-) diff --git a/bltGrMarkerBitmap.C b/bltGrMarkerBitmap.C index 346030a..92e5640 100644 --- a/bltGrMarkerBitmap.C +++ b/bltGrMarkerBitmap.C @@ -83,7 +83,6 @@ static Tk_OptionSpec optionSpecs[] = { static MarkerConfigProc ConfigureBitmapProc; static MarkerDrawProc DrawBitmapProc; -static MarkerFreeProc FreeBitmapProc; static MarkerMapProc MapBitmapProc; static MarkerPointProc PointInBitmapProc; static MarkerPostscriptProc BitmapToPostscriptProc; @@ -93,7 +92,6 @@ static MarkerClass bitmapMarkerClass = { optionSpecs, ConfigureBitmapProc, DrawBitmapProc, - FreeBitmapProc, MapBitmapProc, PointInBitmapProc, RegionInBitmapProc, @@ -319,20 +317,3 @@ static void BitmapToPostscriptProc(Marker* markerPtr, Blt_Ps ps) " } imagemask\n", "grestore\n", (char*)NULL); } - -static void FreeBitmapProc(Marker* markerPtr) -{ - Graph* graphPtr = markerPtr->obj.graphPtr; - BitmapMarker* bmPtr = (BitmapMarker*)markerPtr; - BitmapMarkerOptions* ops = (BitmapMarkerOptions*)bmPtr->ops; - - if (bmPtr->gc) - Tk_FreeGC(graphPtr->display, bmPtr->gc); - - if (bmPtr->fillGC) - Tk_FreeGC(graphPtr->display, bmPtr->fillGC); - - if (ops) - free(ops); -} - diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index 6405d1b..884880f 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -46,12 +46,6 @@ extern "C" { using namespace Blt; -extern MarkerCreateProc Blt_CreateBitmapProc; -extern MarkerCreateProc Blt_CreateLineProc; -extern MarkerCreateProc Blt_CreatePolygonProc; -extern MarkerCreateProc Blt_CreateTextProc; -extern MarkerCreateProc Blt_CreateWindowProc; - #define NORMALIZE(A,x) (((x) - (A)->axisRange.min) * (A)->axisRange.scale) Marker::Marker(Graph* graphPtr, const char* name) @@ -110,7 +104,6 @@ typedef int (GraphMarkerProc)(Graph* graphPtr, Tcl_Interp* interp, int objc, static int MarkerObjConfigure( Tcl_Interp* interp, Graph* graphPtr, Marker* markerPtr, int objc, Tcl_Obj* const objv[]); -static void DestroyMarker(Marker* markerPtr); static int GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj* objPtr, Marker** markerPtrPtr); static int IsElementHidden(Marker* markerPtr); @@ -324,7 +317,7 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp, Tcl_SetHashValue(hPtr, markerPtr); if ((Tk_InitOptions(graphPtr->interp, (char*)markerPtr->ops, markerPtr->optionTable, graphPtr->tkwin) != TCL_OK) || (MarkerObjConfigure(interp, graphPtr, markerPtr, objc-offset, objv+offset) != TCL_OK)) { - DestroyMarker(markerPtr); + delete markerPtr; return TCL_ERROR; } @@ -335,34 +328,6 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp, return TCL_OK; } -static void DestroyMarker(Marker* markerPtr) -{ - Graph* graphPtr = markerPtr->obj.graphPtr; - MarkerOptions* ops = (MarkerOptions*)markerPtr->ops; - - // If the marker to be deleted is currently displayed below the - // elements, then backing store needs to be repaired. - if (ops->drawUnder) - graphPtr->flags |= CACHE_DIRTY; - - Blt_DeleteBindings(graphPtr->bindTable, markerPtr); - - if (markerPtr->obj.name) - free((void*)markerPtr->obj.name); - - if (markerPtr->hashPtr) - Tcl_DeleteHashEntry(markerPtr->hashPtr); - - if (markerPtr->link) - Blt_Chain_DeleteLink(graphPtr->markers.displayList, markerPtr->link); - - Tk_FreeConfigOptions((char*)markerPtr->ops, markerPtr->optionTable, - graphPtr->tkwin); - - (*markerPtr->classPtr->freeProc)(markerPtr); - free(markerPtr); -} - // Configure static int CgetOp(Graph* graphPtr, Tcl_Interp* interp, @@ -933,7 +898,7 @@ ClientData Blt_MakeMarkerTag(Graph* graphPtr, const char* tagName) void Blt_FreeMarker(char* dataPtr) { Marker* markerPtr = (Marker*)dataPtr; - DestroyMarker(markerPtr); + delete markerPtr; } int Blt_BoxesDontOverlap(Graph* graphPtr, Region2d *extsPtr) diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h index d766803..cb5971e 100644 --- a/src/bltGrMarker.h +++ b/src/bltGrMarker.h @@ -37,7 +37,6 @@ namespace Blt { typedef Marker* (MarkerCreateProc)(Graph*); typedef void (MarkerDrawProc)(Marker* markerPtr, Drawable drawable); -typedef void (MarkerFreeProc)(Marker* markerPtr); typedef int (MarkerConfigProc)(Marker* markerPtr); typedef void (MarkerMapProc)(Marker* markerPtr); typedef void (MarkerPostscriptProc)(Marker* markerPtr, Blt_Ps ps); @@ -48,7 +47,6 @@ typedef struct { Tk_OptionSpec *optionSpecs; MarkerConfigProc *configProc; MarkerDrawProc *drawProc; - MarkerFreeProc *freeProc; MarkerMapProc *mapProc; MarkerPointProc *pointProc; MarkerRegionProc *regionProc; diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C index 811769d..ca6e6fb 100644 --- a/src/bltGrMarkerLine.C +++ b/src/bltGrMarkerLine.C @@ -89,7 +89,6 @@ static Tk_OptionSpec optionSpecs[] = { static MarkerConfigProc ConfigureLineProc; static MarkerDrawProc DrawLineProc; -static MarkerFreeProc FreeLineProc; static MarkerMapProc MapLineProc; static MarkerPointProc PointInLineProc; static MarkerPostscriptProc LineToPostscriptProc; @@ -99,7 +98,6 @@ static MarkerClass lineMarkerClass = { optionSpecs, ConfigureLineProc, DrawLineProc, - FreeLineProc, MapLineProc, PointInLineProc, RegionInLineProc, @@ -277,22 +275,6 @@ static void LineToPostscriptProc(Marker* markerPtr, Blt_Ps ps) } } -static void FreeLineProc(Marker* markerPtr) -{ - LineMarker *lmPtr = (LineMarker*)markerPtr; - Graph* graphPtr = markerPtr->obj.graphPtr; - LineMarkerOptions* ops = (LineMarkerOptions*)lmPtr->ops; - - if (lmPtr->gc) - Blt_FreePrivateGC(graphPtr->display, lmPtr->gc); - - if (lmPtr->segments) - free(lmPtr->segments); - - if (ops) - free(ops); -} - static void MapLineProc(Marker* markerPtr) { Graph* graphPtr = markerPtr->obj.graphPtr; diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C index a63f817..71e0e6f 100644 --- a/src/bltGrMarkerPolygon.C +++ b/src/bltGrMarkerPolygon.C @@ -97,7 +97,6 @@ static Tk_OptionSpec optionSpecs[] = { static MarkerConfigProc ConfigurePolygonProc; static MarkerDrawProc DrawPolygonProc; -static MarkerFreeProc FreePolygonProc; static MarkerMapProc MapPolygonProc; static MarkerPointProc PointInPolygonProc; static MarkerPostscriptProc PolygonToPostscriptProc; @@ -107,7 +106,6 @@ static MarkerClass polygonMarkerClass = { optionSpecs, ConfigurePolygonProc, DrawPolygonProc, - FreePolygonProc, MapPolygonProc, PointInPolygonProc, RegionInPolygonProc, @@ -361,31 +359,6 @@ static int ConfigurePolygonProc(Marker* markerPtr) return TCL_OK; } -static void FreePolygonProc(Marker* markerPtr) -{ - Graph* graphPtr = markerPtr->obj.graphPtr; - PolygonMarker *pmPtr = (PolygonMarker *)markerPtr; - PolygonMarkerOptions* ops = (PolygonMarkerOptions*)pmPtr->ops; - - if (pmPtr->fillGC) - Tk_FreeGC(graphPtr->display, pmPtr->fillGC); - - if (pmPtr->outlineGC) - Blt_FreePrivateGC(graphPtr->display, pmPtr->outlineGC); - - if (pmPtr->fillPts) - free(pmPtr->fillPts); - - if (pmPtr->outlinePts) - free(pmPtr->outlinePts); - - if (pmPtr->screenPts) - free(pmPtr->screenPts); - - if (ops) - free(ops); -} - static void MapPolygonProc(Marker* markerPtr) { Graph* graphPtr = markerPtr->obj.graphPtr; diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C index 57bfdfa..09b84c2 100644 --- a/src/bltGrMarkerText.C +++ b/src/bltGrMarkerText.C @@ -87,7 +87,6 @@ static Tk_OptionSpec optionSpecs[] = { static MarkerConfigProc ConfigureTextProc; static MarkerDrawProc DrawTextProc; -static MarkerFreeProc FreeTextProc; static MarkerMapProc MapTextProc; static MarkerPointProc PointInTextProc; static MarkerPostscriptProc TextToPostscriptProc; @@ -97,7 +96,6 @@ static MarkerClass textMarkerClass = { optionSpecs, ConfigureTextProc, DrawTextProc, - FreeTextProc, MapTextProc, PointInTextProc, RegionInTextProc, @@ -302,16 +300,3 @@ static void TextToPostscriptProc(Marker* markerPtr, Blt_Ps ps) Blt_Ps_DrawText(ps, ops->string, &ops->style, tmPtr->anchorPt.x, tmPtr->anchorPt.y); } - -static void FreeTextProc(Marker* markerPtr) -{ - Graph* graphPtr = markerPtr->obj.graphPtr; - TextMarker* tmPtr = (TextMarker*)markerPtr; - TextMarkerOptions* ops = (TextMarkerOptions*)tmPtr->ops; - - Blt_Ts_FreeStyle(graphPtr->display, &ops->style); - - if (ops) - free(ops); -} - -- cgit v0.12