diff options
| -rw-r--r-- | src/bltGrAxis.C | 3 | ||||
| -rw-r--r-- | src/bltGrBind.C | 2 | ||||
| -rw-r--r-- | src/bltGrElem.C | 3 | ||||
| -rw-r--r-- | src/bltGrMarker.C | 9 |
4 files changed, 6 insertions, 11 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C index 108c4ce..93f26b8 100644 --- a/src/bltGrAxis.C +++ b/src/bltGrAxis.C @@ -268,8 +268,7 @@ Axis::~Axis() { AxisOptions* ops = (AxisOptions*)ops_; - if (graphPtr_->bindTable_) - graphPtr_->bindTable_->deleteBindings(this); + graphPtr_->bindTable_->deleteBindings(this); if (link) Blt_Chain_DeleteLink(chain, link); diff --git a/src/bltGrBind.C b/src/bltGrBind.C index 51e73c2..bb4270b 100644 --- a/src/bltGrBind.C +++ b/src/bltGrBind.C @@ -124,7 +124,6 @@ void BindTable::deleteBindings(ClientData object) { Tk_DeleteAllBindings(table_, object); - // If this is the object currently picked, we need to repick one. if (currentItem_ == object) { currentItem_ =NULL; currentContext_ =CID_NONE; @@ -141,7 +140,6 @@ void BindTable::deleteBindings(ClientData object) } } -// ClassId classId = (ClassId)(long(context)); void BindTable::doEvent(XEvent* eventPtr, ClientData item, ClassId classId) { if (!graphPtr_->tkwin_ || !table_) diff --git a/src/bltGrElem.C b/src/bltGrElem.C index 43fdfac..d98267f 100644 --- a/src/bltGrElem.C +++ b/src/bltGrElem.C @@ -59,8 +59,7 @@ Element::Element(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr) Element::~Element() { - if (graphPtr_->bindTable_) - graphPtr_->bindTable_->deleteBindings(this); + graphPtr_->bindTable_->deleteBindings(this); if (link) Blt_Chain_DeleteLink(graphPtr_->elements_.displayList, link); diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index 1c82b3d..fb20c25 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -39,13 +39,13 @@ using namespace Blt; -Marker::Marker(Graph* gPtr, const char* nPtr, Tcl_HashEntry* hPtr) +Marker::Marker(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr) { optionTable_ =NULL; ops_ =NULL; - graphPtr_ =gPtr; - name_ = dupstr(nPtr); + graphPtr_ =graphPtr; + name_ = dupstr(name); hashPtr_ = hPtr; link =NULL; flags =0; @@ -54,8 +54,7 @@ Marker::Marker(Graph* gPtr, const char* nPtr, Tcl_HashEntry* hPtr) Marker::~Marker() { - if (graphPtr_->bindTable_) - graphPtr_->bindTable_->deleteBindings(this); + graphPtr_->bindTable_->deleteBindings(this); if (link) Blt_Chain_DeleteLink(graphPtr_->markers_.displayList, link); |