diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-07 14:17:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-07 14:17:04 (GMT) |
| commit | 9c1efe75728c82bac699e8655961bc22d2f453bf (patch) | |
| tree | eb562b7d88b4f265a1c8537b99fb5435cdd80c86 /generic/tkConfig.c | |
| parent | b89da6945eafaaadc7626c49d36c848df33b4e32 (diff) | |
| download | tk-9c1efe75728c82bac699e8655961bc22d2f453bf.zip tk-9c1efe75728c82bac699e8655961bc22d2f453bf.tar.gz tk-9c1efe75728c82bac699e8655961bc22d2f453bf.tar.bz2 | |
TCL_INDEX_NULL_OK -> TCL_NULL_OK (following TIP #618)
Diffstat (limited to 'generic/tkConfig.c')
| -rw-r--r-- | generic/tkConfig.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c index 6314bb2..0c7bc6f 100644 --- a/generic/tkConfig.c +++ b/generic/tkConfig.c @@ -619,7 +619,7 @@ DoObjConfig( } else { oldInternalPtr = (char *) &internal.internalForm; } - nullOK = (optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_INDEX_NULL_OK)); + nullOK = (optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK)); switch (optionPtr->specPtr->type) { case TK_OPTION_BOOLEAN: { int newBool; @@ -744,7 +744,7 @@ DoObjConfig( } else { if (Tcl_GetIndexFromObjStruct(interp, valuePtr, optionPtr->specPtr->clientData, sizeof(char *), - optionPtr->specPtr->optionName+1, (nullOK ? TCL_INDEX_NULL_OK : 0), &newValue) != TCL_OK) { + optionPtr->specPtr->optionName+1, (nullOK ? TCL_NULL_OK : 0), &newValue) != TCL_OK) { return TCL_ERROR; } } @@ -863,7 +863,7 @@ DoObjConfig( valuePtr = NULL; newRelief = TK_RELIEF_NULL; } else if (Tcl_GetIndexFromObj(interp, valuePtr, tkReliefStrings, - "relief", (nullOK ? TCL_INDEX_NULL_OK : 0), &newRelief) != TCL_OK) { + "relief", (nullOK ? TCL_NULL_OK : 0), &newRelief) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { @@ -898,7 +898,7 @@ DoObjConfig( valuePtr = NULL; newJustify = -1; } else if (Tcl_GetIndexFromObj(interp, valuePtr, tkJustifyStrings, - "justification", (nullOK ? TCL_INDEX_NULL_OK : 0), &newJustify) != TCL_OK) { + "justification", (nullOK ? TCL_NULL_OK : 0), &newJustify) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { @@ -914,7 +914,7 @@ DoObjConfig( valuePtr = NULL; newAnchor = -1; } else if (Tcl_GetIndexFromObj(interp, valuePtr, tkAnchorStrings, - "anchor", (nullOK ? TCL_INDEX_NULL_OK : 0), &newAnchor) != TCL_OK) { + "anchor", (nullOK ? TCL_NULL_OK : 0), &newAnchor) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { @@ -1966,7 +1966,7 @@ GetObjectForOption( } break; case TK_OPTION_INT: - if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_INDEX_NULL_OK)) || *((int *) internalPtr) != INT_MIN) { + if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK)) || *((int *) internalPtr) != INT_MIN) { objPtr = Tcl_NewWideIntObj(*((int *)internalPtr)); } break; @@ -1986,7 +1986,7 @@ GetObjectForOption( } break; case TK_OPTION_DOUBLE: - if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_INDEX_NULL_OK)) || !isnan(*((double *) internalPtr))) { + if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK)) || !isnan(*((double *) internalPtr))) { objPtr = Tcl_NewDoubleObj(*((double *) internalPtr)); } break; @@ -2074,7 +2074,7 @@ GetObjectForOption( *((Tk_Anchor *)internalPtr)), -1); break; case TK_OPTION_PIXELS: - if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_INDEX_NULL_OK)) || *((int *) internalPtr) != INT_MIN) { + if (!(optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK)) || *((int *) internalPtr) != INT_MIN) { objPtr = Tcl_NewWideIntObj(*((int *)internalPtr)); } break; |