summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjoye <joye>2014-03-31 17:34:38 (GMT)
committerjoye <joye>2014-03-31 17:34:38 (GMT)
commit0543dc1bd8e785a91db7845c2f44119f30464fe3 (patch)
treec39112c10782b50519147d4443ef6e3f59dc8001 /src
parentb2a9c01cf4381574956d51855abfc65565db38c1 (diff)
downloadblt-0543dc1bd8e785a91db7845c2f44119f30464fe3.zip
blt-0543dc1bd8e785a91db7845c2f44119f30464fe3.tar.gz
blt-0543dc1bd8e785a91db7845c2f44119f30464fe3.tar.bz2
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/bltGrMarkerOp.C18
-rw-r--r--src/bltGrMarkerOp.h3
-rw-r--r--src/bltGraph.C2
3 files changed, 13 insertions, 10 deletions
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 9949bc9..0cdc770 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -49,7 +49,7 @@ using namespace Blt;
typedef int (GraphMarkerProc)(Graph* graphPtr, Tcl_Interp* interp, int objc,
Tcl_Obj* const objv[]);
-void Blt_FreeMarker(char* dataPtr);
+static void FreeMarker(char* dataPtr);
static int MarkerObjConfigure( Tcl_Interp* interp, Graph* graphPtr,
Marker* markerPtr,
int objc, Tcl_Obj* const objv[]);
@@ -249,7 +249,7 @@ static int DeleteOp(Graph* graphPtr, Tcl_Interp* interp,
return TCL_ERROR;
}
markerPtr->flags |= DELETE_PENDING;
- Tcl_EventuallyFree(markerPtr, Blt_FreeMarker);
+ Tcl_EventuallyFree(markerPtr, FreeMarker);
}
Blt_EventuallyRedrawGraph(graphPtr);
@@ -500,6 +500,14 @@ static int GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr,
return TCL_ERROR;
}
+static void FreeMarker(char* dataPtr)
+{
+ Marker* markerPtr = (Marker*)dataPtr;
+ delete markerPtr;
+}
+
+// export
+
void Blt_MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under)
{
for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers.displayList);
@@ -613,9 +621,3 @@ ClientData Blt_MakeMarkerTag(Graph* graphPtr, const char* tagName)
return Tcl_GetHashKey(&graphPtr->markers.tagTable, hPtr);
}
-void Blt_FreeMarker(char* dataPtr)
-{
- Marker* markerPtr = (Marker*)dataPtr;
- delete markerPtr;
-}
-
diff --git a/src/bltGrMarkerOp.h b/src/bltGrMarkerOp.h
index 1d22304..069d960 100644
--- a/src/bltGrMarkerOp.h
+++ b/src/bltGrMarkerOp.h
@@ -32,12 +32,13 @@
extern void Blt_DestroyMarkers(Graph* graphPtr);
extern void Blt_DrawMarkers(Graph* graphPtr, Drawable drawable, int under);
-extern ClientData Blt_MakeMarkerTag(Graph* graphPtr, const char* tagName);
extern void Blt_MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under);
extern int Blt_MarkerOp(Graph* graphPtr, Tcl_Interp* interp,
int objc, Tcl_Obj* const objv[]);
extern void Blt_MapMarkers(Graph* graphPtr);
extern void* Blt_NearestMarker(Graph* graphPtr, int x, int y, int under);
+extern ClientData Blt_MakeMarkerTag(Graph* graphPtr, const char* tagName);
+extern void Blt_ConfigureMarkers(Graph*);
namespace Blt {
};
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 31347cf..adb3bc3 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -1295,5 +1295,5 @@ void Blt_ReconfigureGraph(Graph* graphPtr)
// Blt_ConfigureLegend(graphPtr);
// Blt_ConfigureElements(graphPtr);
Blt_ConfigureAxes(graphPtr);
- // Blt_ConfigureMarkers(graphPtr);
+ Blt_ConfigureMarkers(graphPtr);
}