diff options
| -rw-r--r-- | src/bltGrMarker.C | 14 | ||||
| -rw-r--r-- | src/bltGrMarkerLine.C | 2 | ||||
| -rw-r--r-- | src/bltGraph.C | 25 |
3 files changed, 6 insertions, 35 deletions
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index ab2af75..b0e0f64 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -51,7 +51,6 @@ extern MarkerCreateProc Blt_CreateWindowProc; Marker::Marker() { - /* obj.classId = CID_NONE; obj.name =NULL; obj.className =NULL; @@ -64,7 +63,6 @@ Marker::Marker() link =NULL; clipped =0; flags =0; - */ } Marker::~Marker() @@ -277,9 +275,9 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp, const char* type = Tcl_GetString(objv[3]); Marker* markerPtr; - if (!strcmp(type, "text")) { - markerPtr = Blt_CreateTextProc(graphPtr); - Blt_GraphSetObjectClass(&markerPtr->obj, CID_MARKER_TEXT); + if (!strcmp(type, "bitmap")) { + markerPtr = Blt_CreateBitmapProc(graphPtr); + Blt_GraphSetObjectClass(&markerPtr->obj, CID_MARKER_BITMAP); } else if (!strcmp(type, "line")) { markerPtr = Blt_CreateLineProc(graphPtr); @@ -289,9 +287,9 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp, markerPtr = Blt_CreatePolygonProc(graphPtr); Blt_GraphSetObjectClass(&markerPtr->obj, CID_MARKER_POLYGON); } - else if (!strcmp(type, "bitmap")) { - markerPtr = Blt_CreateBitmapProc(graphPtr); - Blt_GraphSetObjectClass(&markerPtr->obj, CID_MARKER_BITMAP); + else if (!strcmp(type, "text")) { + markerPtr = Blt_CreateTextProc(graphPtr); + Blt_GraphSetObjectClass(&markerPtr->obj, CID_MARKER_TEXT); } else if (!strcmp(type, "window")) { markerPtr = Blt_CreateWindowProc(graphPtr); diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C index 1bfd652..99d7452 100644 --- a/src/bltGrMarkerLine.C +++ b/src/bltGrMarkerLine.C @@ -39,12 +39,10 @@ using namespace Blt; LineMarker::LineMarker() : Marker() { - /* gc =NULL; segments =NULL; nSegments =0; xorState =0; - */ } LineMarker::~LineMarker() diff --git a/src/bltGraph.C b/src/bltGraph.C index d738432..f959994 100644 --- a/src/bltGraph.C +++ b/src/bltGraph.C @@ -948,37 +948,12 @@ static void AdjustAxisPointers(Graph* graphPtr) } } -/* - *--------------------------------------------------------------------------- - * - * Blt_GraphTags -- - * - * Sets the binding tags for a graph obj. This routine is called by Tk - * when an event occurs in the graph. It fills an array of pointers with - * bind tag addresses. - * - * The object addresses are strings hashed in one of two tag tables: one - * for elements and the another for markers. Note that there's only one - * binding table for elements and markers. [We don't want to trigger - * both a marker and element bind command for the same event.] But we - * don't want a marker and element with the same tag name to activate the - * others bindings. A tag "all" for markers should mean all markers, not - * all markers and elements. As a result, element and marker tags are - * stored in separate hash tables, which means we can't generate the same - * tag address for both an elements and marker, even if they have the - * same name. - * - *--------------------------------------------------------------------------- - */ - void Blt_GraphTags(Blt_BindTable table, ClientData object, ClientData context, Blt_List list) { Graph* graphPtr = (Graph*)Blt_GetBindingData(table); ClassId classId = (ClassId)(long(context)); - - // switch (graphObjPtr->classId) { switch (classId) { case CID_ELEM_BAR: case CID_ELEM_LINE: |