From 6773f7812a1888844f15ed1140f0525cad0c0022 Mon Sep 17 00:00:00 2001
From: joye <joye>
Date: Thu, 27 Mar 2014 16:01:57 +0000
Subject: *** empty log message ***

---
 library/graph.tcl | 16 ++++------------
 src/bltGrElemOp.C | 12 ++++++------
 src/bltGrMarker.C | 25 +++++++++++++------------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/library/graph.tcl b/library/graph.tcl
index 205aa85..d439484 100644
--- a/library/graph.tcl
+++ b/library/graph.tcl
@@ -196,9 +196,7 @@ proc blt::FlashPoint { g name index count } {
 	after 200 blt::FlashPoint $g $name $index $count
 	update
     } else {
-	foreach mm [$g marker names "bltClosest_*"] {
-	    catch {eval $g marker delete $mm}
-	}
+	catch {eval $g marker delete [$g marker names "bltClosest_*"]}
     }
 }
 
@@ -313,9 +311,7 @@ proc blt::ZoomStack::Pop { g } {
 proc blt::ZoomStack::Push { g } {
     variable _private
 
-    foreach mm [$g marker names "zoom*"] {
-	catch {eval $g marker delete $mm}
-    }
+    catch {eval $g marker delete [$g marker names "zoom*"]}
     if { [info exists _private($g,afterId)] } {
 	after cancel $_private($g,afterId)
     }
@@ -393,9 +389,7 @@ proc blt::ZoomStack::Reset { g } {
     if { ![info exists _private($g,corner)] } {
 	Init $g 
     }
-    foreach mm [$g marker names "zoom*"] {
-	catch {eval $g marker delete $mm}
-    }
+    catch {eval $g marker delete [$g marker names "zoom*"]}
 
     if { $_private($g,corner) == "A" } {
 	# Reset the whole axis
@@ -505,9 +499,7 @@ proc blt::ZoomStack::DragFinish { g x y } {
     if { [DragMotion $g $x $y] } {
 	Push $g 
     } else {
-	foreach mm [$g marker names "zoom*"] {
-	    catch {eval $g marker delete [$g marker names "zoom*"]}
-	}
+	catch {eval $g marker delete [$g marker names "zoom*"]}
 	if { [info exists _private($g,afterId)] } {
 	    after cancel $_private($g,afterId)
 	}
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 427dbee..ffd1d43 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -893,14 +893,14 @@ static Blt_OpSpec elemOps[] = {
   {"closest",    2, (void*)ClosestOp,    5, 0, "x y ?elemName?...",},
   {"configure",  2, (void*)ConfigureOp,  4, 0, "elemName ?option value?...",},
   {"create",     2, (void*)CreateOp,     4, 0, "elemName ?option value?...",},
-  {"deactivate", 3, (void*)DeactivateOp, 4, 0, "?elemName?...",},
-  {"delete",     3, (void*)DeleteOp,     4, 0, "?elemName?...",},
+  {"deactivate", 3, (void*)DeactivateOp, 3, 0, "?elemName?...",},
+  {"delete",     3, (void*)DeleteOp,     3, 0, "?elemName?...",},
   {"exists",     1, (void*)ExistsOp,     4, 4, "elemName",},
-  {"get",        1, (void*)GetOp,        4, 4, "name",},
-  {"lower",      1, (void*)LowerOp,      4, 0, "?elemName?...",},
+  {"get",        1, (void*)GetOp,        4, 4, "current",},
+  {"lower",      1, (void*)LowerOp,      3, 0, "?elemName?...",},
   {"names",      1, (void*)NamesOp,      3, 0, "?pattern?...",},
-  {"raise",      1, (void*)RaiseOp,      4, 0, "?elemName?...",},
-  {"show",       1, (void*)ShowOp,       4, 0, "?elemList?",},
+  {"raise",      1, (void*)RaiseOp,      3, 0, "?elemName?...",},
+  {"show",       1, (void*)ShowOp,       4, 4, "elemList",},
   {"type",       1, (void*)TypeOp,       4, 4, "elemName",},
 };
 static int numElemOps = sizeof(elemOps) / sizeof(Blt_OpSpec);
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 6c72cd7..0d92ae1 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -445,18 +445,19 @@ static int CreateOp(Graph* graphPtr, Tcl_Interp* interp,
 static int DeleteOp(Graph* graphPtr, Tcl_Interp* interp, 
 		    int objc, Tcl_Obj* const objv[])
 {
-  Marker *markerPtr;
-  if (GetMarkerFromObj(NULL, graphPtr, objv[3], &markerPtr) != TCL_OK) {
-    Tcl_AppendResult(interp, "can't find marker \"", 
-		     Tcl_GetString(objv[3]), "\" in \"", 
-		     Tk_PathName(graphPtr->tkwin), "\"", NULL);
-    return TCL_ERROR;
+  for (int ii=3; ii<objc; ii++) {
+    Marker *markerPtr;
+    if (GetMarkerFromObj(NULL, graphPtr, objv[ii], &markerPtr) != TCL_OK) {
+      Tcl_AppendResult(interp, "can't find marker \"", 
+		       Tcl_GetString(objv[ii]), "\" in \"", 
+		       Tk_PathName(graphPtr->tkwin), "\"", NULL);
+      return TCL_ERROR;
+    }
+    markerPtr->flags |= DELETE_PENDING;
+    Tcl_EventuallyFree(markerPtr, Blt_FreeMarker);
   }
 
-  markerPtr->flags |= DELETE_PENDING;
-  Tcl_EventuallyFree(markerPtr, Blt_FreeMarker);
   Blt_EventuallyRedrawGraph(graphPtr);
-
   return TCL_OK;
 }
 
@@ -650,12 +651,12 @@ static Blt_OpSpec markerOps[] =
     {"cget",      2, (void*)CgetOp,   5, 5, "marker option",},
     {"configure", 2, (void*)ConfigureOp, 4, 0,"marker ?option value?...",},
     {"create",    2, (void*)CreateOp, 4, 0, "type ?option value?...",},
-    {"delete",    1, (void*)DeleteOp, 4, 4, "marker",},
+    {"delete",    1, (void*)DeleteOp, 3, 0, "?marker?...",},
     {"exists",    1, (void*)ExistsOp, 4, 4, "marker",},
-    {"find",      1, (void*)FindOp,   8, 8, "enclosed|overlapping x1 y1 x2 y2",},
+    {"find",      1, (void*)FindOp,   8, 8, "option x1 y1 x2 y2",},
     {"get",       1, (void*)GetOp,    5, 5, "current",},
     {"lower",     1, (void*)RelinkOp, 4, 5, "marker ?afterMarker?",},
-    {"names",     1, (void*)NamesOp,  3, 0, "?pattern?",},
+    {"names",     1, (void*)NamesOp,  3, 0, "?pattern?...",},
     {"raise",     1, (void*)RelinkOp, 4, 5, "marker ?beforeMarker?",},
     {"type",      1, (void*)TypeOp,   4, 4, "marker",},
   };
-- 
cgit v0.12