diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-05 13:48:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-05 13:48:10 (GMT) |
| commit | 8dcd0c3affd7c9e7220daa443f906abb7842aeb4 (patch) | |
| tree | 3831179006d1df851d87ec375078dd9c86750dbb /generic/tkConfig.c | |
| parent | b551efdee5768dd7fce2e0fe05406c37a53d4f6b (diff) | |
| download | tk-8dcd0c3affd7c9e7220daa443f906abb7842aeb4.zip tk-8dcd0c3affd7c9e7220daa443f906abb7842aeb4.tar.gz tk-8dcd0c3affd7c9e7220daa443f906abb7842aeb4.tar.bz2 | |
Make Tk 8.7 work with both TIP #613 and TIP #618
Diffstat (limited to 'generic/tkConfig.c')
| -rw-r--r-- | generic/tkConfig.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c index e9db3b9..2ad05e4 100644 --- a/generic/tkConfig.c +++ b/generic/tkConfig.c @@ -85,6 +85,8 @@ typedef struct TkOption { #define OPTION_NEEDS_FREEING 1 +#define INDEX_NULL_OK (32+4) /* Combination of TCL_INDEX_NULL_OK (TIP #613) and TCL_NULL_OK (TIP #618) */ + /* * One of the following exists for each Tk_OptionSpec array that has been * passed to Tk_CreateOptionTable. @@ -735,7 +737,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 ? INDEX_NULL_OK : 0), &newValue) != TCL_OK) { return TCL_ERROR; } } @@ -842,7 +844,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 ? INDEX_NULL_OK : 0), &newRelief) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { @@ -877,7 +879,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 ? INDEX_NULL_OK : 0), &newJustify) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { @@ -893,7 +895,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 ? INDEX_NULL_OK : 0), &newAnchor) != TCL_OK) { return TCL_ERROR; } if (internalPtr != NULL) { |