diff options
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_tkinter.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 4bced69..403cd71 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -998,6 +998,15 @@ AsObj(PyObject *value) } } +static PyObject * +fromBoolean(PyObject* tkapp, Tcl_Obj *value) +{ + int boolValue; + if (Tcl_GetBooleanFromObj(Tkapp_Interp(tkapp), value, &boolValue) == TCL_ERROR) + return Tkinter_Error(tkapp); + return PyBool_FromLong(boolValue); +} + static PyObject* FromObj(PyObject* tkapp, Tcl_Obj *value) { @@ -1011,10 +1020,7 @@ FromObj(PyObject* tkapp, Tcl_Obj *value) if (value->typePtr == app->BooleanType || value->typePtr == app->OldBooleanType) { - int boolValue; - if (Tcl_GetBooleanFromObj(interp, value, &boolValue) == TCL_ERROR) - return Tkinter_Error(tkapp); - return PyBool_FromLong(boolValue); + return fromBoolean(tkapp, value); } if (value->typePtr == app->ByteArrayType) { @@ -1069,6 +1075,15 @@ FromObj(PyObject* tkapp, Tcl_Obj *value) Tcl_GetCharLength(value)); } +#if TK_VERSION_HEX >= 0x08050000 + if (app->BooleanType == NULL && + strcmp(value->typePtr->name, "booleanString") == 0) { + /* booleanString type is not registered in Tcl */ + app->BooleanType = value->typePtr; + return fromBoolean(tkapp, value); + } +#endif + return newPyTclObject(value); } |