From 9f65f5b1920f870fd136b8c0c88880268ea02713 Mon Sep 17 00:00:00 2001 From: joye Date: Thu, 27 Mar 2014 21:13:04 +0000 Subject: *** empty log message *** --- bltGrMarkerBitmap.C | 12 ------------ src/bltGrMarkerLine.C | 15 --------------- src/bltGrMarkerPolygon.C | 12 ------------ src/bltGrMarkerText.C | 14 -------------- 4 files changed, 53 deletions(-) diff --git a/bltGrMarkerBitmap.C b/bltGrMarkerBitmap.C index ec7b586..346030a 100644 --- a/bltGrMarkerBitmap.C +++ b/bltGrMarkerBitmap.C @@ -81,7 +81,6 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0} }; -MarkerCreateProc Blt_CreateBitmapProc; static MarkerConfigProc ConfigureBitmapProc; static MarkerDrawProc DrawBitmapProc; static MarkerFreeProc FreeBitmapProc; @@ -129,17 +128,6 @@ BitmapMarker::~BitmapMarker() Tk_FreeGC(graphPtr->display, fillGC); } -Marker* Blt_CreateBitmapProc(Graph* graphPtr) -{ - BitmapMarker* bmPtr = (BitmapMarker*)calloc(1, sizeof(BitmapMarker)); - bmPtr->classPtr = &bitmapMarkerClass; - bmPtr->ops = (BitmapMarkerOptions*)calloc(1, sizeof(BitmapMarkerOptions)); - - bmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs); - - return (Marker*)bmPtr; -} - static int ConfigureBitmapProc(Marker* markerPtr) { Graph* graphPtr = markerPtr->obj.graphPtr; diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C index ac28ee5..811769d 100644 --- a/src/bltGrMarkerLine.C +++ b/src/bltGrMarkerLine.C @@ -87,7 +87,6 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0} }; -MarkerCreateProc Blt_CreateLineProc; static MarkerConfigProc ConfigureLineProc; static MarkerDrawProc DrawLineProc; static MarkerFreeProc FreeLineProc; @@ -133,20 +132,6 @@ LineMarker::~LineMarker() free(segments); } -Marker* Blt_CreateLineProc(Graph* graphPtr) -{ - LineMarker* lmPtr = (LineMarker*)calloc(1, sizeof(LineMarker)); - - lmPtr->classPtr = &lineMarkerClass; - lmPtr->ops = (LineMarkerOptions*)calloc(1, sizeof(LineMarkerOptions)); - LineMarkerOptions* ops = (LineMarkerOptions*)lmPtr->ops; - - ops->xorr = FALSE; - lmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs); - - return (Marker*)lmPtr; -} - static int PointInLineProc(Marker* markerPtr, Point2d *samplePtr) { LineMarker *lmPtr = (LineMarker*)markerPtr; diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C index 9b93cd1..a63f817 100644 --- a/src/bltGrMarkerPolygon.C +++ b/src/bltGrMarkerPolygon.C @@ -95,7 +95,6 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0} }; -MarkerCreateProc Blt_CreatePolygonProc; static MarkerConfigProc ConfigurePolygonProc; static MarkerDrawProc DrawPolygonProc; static MarkerFreeProc FreePolygonProc; @@ -150,17 +149,6 @@ PolygonMarker::~PolygonMarker() free(screenPts); } -Marker* Blt_CreatePolygonProc(Graph* graphPtr) -{ - PolygonMarker* pmPtr = (PolygonMarker*)calloc(1, sizeof(PolygonMarker)); - pmPtr->classPtr = &polygonMarkerClass; - pmPtr->ops = (PolygonMarkerOptions*)calloc(1, sizeof(PolygonMarkerOptions)); - - pmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs); - - return (Marker*)pmPtr; -} - static int PointInPolygonProc(Marker* markerPtr, Point2d *samplePtr) { PolygonMarker *pmPtr = (PolygonMarker *)markerPtr; diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C index 6f67593..57bfdfa 100644 --- a/src/bltGrMarkerText.C +++ b/src/bltGrMarkerText.C @@ -85,7 +85,6 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_END, NULL, NULL, NULL, NULL, -1, 0, 0, NULL, 0} }; -MarkerCreateProc Blt_CreateTextProc; static MarkerConfigProc ConfigureTextProc; static MarkerDrawProc DrawTextProc; static MarkerFreeProc FreeTextProc; @@ -129,19 +128,6 @@ TextMarker::~TextMarker() Blt_Ts_FreeStyle(graphPtr->display, &((TextMarkerOptions*)ops)->style); } -Blt::Marker* Blt_CreateTextProc(Graph* graphPtr) -{ - TextMarker* tmPtr = (TextMarker*)calloc(1, sizeof(TextMarker)); - tmPtr->classPtr = &textMarkerClass; - tmPtr->ops = (TextMarkerOptions*)calloc(1, sizeof(TextMarkerOptions)); - TextMarkerOptions* ops = (TextMarkerOptions*)tmPtr->ops; - - Blt_Ts_InitStyle(ops->style); - tmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs); - - return (Blt::Marker*)tmPtr; -} - static int ConfigureTextProc(Marker* markerPtr) { Graph* graphPtr = markerPtr->obj.graphPtr; -- cgit v0.12