diff options
| author | joye <joye> | 2014-07-07 19:44:22 (GMT) |
|---|---|---|
| committer | joye <joye> | 2014-07-07 19:44:22 (GMT) |
| commit | 267555b1b725c8ea20cff33f525ea3046a35cf74 (patch) | |
| tree | 0772abe69d47636549e2af1991188659b93a359d /src | |
| parent | 700f30179ceb323f797dccc0f7d596ddb1eed724 (diff) | |
| download | blt-267555b1b725c8ea20cff33f525ea3046a35cf74.zip blt-267555b1b725c8ea20cff33f525ea3046a35cf74.tar.gz blt-267555b1b725c8ea20cff33f525ea3046a35cf74.tar.bz2 | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/bltGrElem.h | 8 | ||||
| -rw-r--r-- | src/bltGrElemOption.C | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/bltGrElem.h b/src/bltGrElem.h index 2d8d7cd..a1e7084 100644 --- a/src/bltGrElem.h +++ b/src/bltGrElem.h @@ -72,6 +72,8 @@ namespace Blt { public: ElemValues(); virtual ~ElemValues(); + + void reset(); }; class ElemValuesSource : public ElemValues @@ -94,9 +96,9 @@ namespace Blt { ElemValuesVector(Element*, const char*); ~ElemValuesVector(); - int GetVectorData(); - int FetchVectorValues(Blt_Vector*); - void FreeVectorSource(); + int getVector(); + int fetchValues(Blt_Vector*); + void freeSource(); }; typedef struct { diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C index 2b3744a..3a877fb 100644 --- a/src/bltGrElemOption.C +++ b/src/bltGrElemOption.C @@ -91,7 +91,7 @@ static int ValuesSetProc(ClientData clientData, Tcl_Interp* interp, if (objc == 1) { if (Blt_VectorExists2(interp, string)) { ElemValuesVector* valuesPtr = new ElemValuesVector(elemPtr, string); - if (valuesPtr->GetVectorData() != TCL_OK) { + if (valuesPtr->getVector() != TCL_OK) { delete valuesPtr; return TCL_ERROR; } @@ -351,18 +351,13 @@ void VectorChangedProc(Tcl_Interp* interp, ClientData clientData, return; if (notify == BLT_VECTOR_NOTIFY_DESTROY) { - valuesPtr->FreeVectorSource(); - if (valuesPtr->values_) - delete [] valuesPtr->values_; - valuesPtr->values_ = NULL; - valuesPtr->nValues_ = 0; - valuesPtr->min_ =0; - valuesPtr->max_ =0; + valuesPtr->freeSource(); + valuesPtr->reset(); } else { Blt_Vector* vector; Blt_GetVectorById(interp, valuesPtr->source_.vector, &vector); - if (valuesPtr->FetchVectorValues(vector) != TCL_OK) + if (valuesPtr->fetchValues(vector) != TCL_OK) return; } |