summaryrefslogtreecommitdiffstats
path: root/src/bltGrMarker.C
diff options
context:
space:
mode:
authorjoye <joye>2014-03-17 21:35:18 (GMT)
committerjoye <joye>2014-03-17 21:35:18 (GMT)
commit616e63f07f6fb11f568c68cb84df210dac876753 (patch)
tree2ed56818f4a36d6bdea3e775a02f41f97aff9e97 /src/bltGrMarker.C
parente397c807bc33cf9af19714912ffb69a30b4014b6 (diff)
downloadblt-616e63f07f6fb11f568c68cb84df210dac876753.zip
blt-616e63f07f6fb11f568c68cb84df210dac876753.tar.gz
blt-616e63f07f6fb11f568c68cb84df210dac876753.tar.bz2
*** empty log message ***
Diffstat (limited to 'src/bltGrMarker.C')
-rw-r--r--src/bltGrMarker.C25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index b07500b..e1c49ca 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -180,14 +180,21 @@ static Tcl_Obj* JoinStyleGetProc(ClientData clientData, Tk_Window tkwin,
static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
int objc, Tcl_Obj* const objv[])
{
- char* name = Tcl_GetString(objv[4]);
int offset = 5;
+ char* name =NULL;
char ident[128];
- // name given?
- if (name[0] == '-') {
+ if (objc == 4) {
+ offset = 4;
sprintf_s(ident, 128, "marker%d", graphPtr->nextMarkerId++);
name = ident;
- offset = 4;
+ }
+ else {
+ name = Tcl_GetString(objv[4]);
+ if (name[0] == '-') {
+ offset = 4;
+ sprintf_s(ident, 128, "marker%d", graphPtr->nextMarkerId++);
+ name = ident;
+ }
}
int isNew;
@@ -271,16 +278,6 @@ static void DestroyMarker(Marker *markerPtr)
if (markerPtr->link)
Blt_Chain_DeleteLink(graphPtr->markers.displayList, markerPtr->link);
- /*
- if (markerPtr->axes.x)
- Blt_ReleaseAxis(markerPtr->axes.x);
- if (markerPtr->axes.y)
- Blt_ReleaseAxis(markerPtr->axes.y);
-
- if (markerPtr->worldPts)
- free(markerPtr->worldPts);
- */
-
Tk_FreeConfigOptions((char*)markerPtr, markerPtr->optionTable,
graphPtr->tkwin);