diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-06-10 20:36:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-06-10 20:36:42 (GMT) |
| commit | 171e4042f5d12fffb74e16d70c99d46f72196541 (patch) | |
| tree | 7a365fd76d8f55c38330fdea700e51c346ce4e66 /generic | |
| parent | 2bc6576988e60413ca7873f9c9899f9f1f012564 (diff) | |
| download | tk-171e4042f5d12fffb74e16d70c99d46f72196541.zip tk-171e4042f5d12fffb74e16d70c99d46f72196541.tar.gz tk-171e4042f5d12fffb74e16d70c99d46f72196541.tar.bz2 | |
Also handle the situation that -padx/-pady is initialized as the empty stringcore-bug-4d0a6f32b7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkMessage.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/generic/tkMessage.c b/generic/tkMessage.c index 05c0c66..65d5f1e 100644 --- a/generic/tkMessage.c +++ b/generic/tkMessage.c @@ -557,6 +557,10 @@ MessageWorldChanged( msgPtr->textGC = gc; Tk_GetFontMetrics(msgPtr->tkfont, &fm); + if (!msgPtr->padXPtr) { + msgPtr->padXPtr = Tcl_NewIntObj(-1); + Tcl_IncrRefCount(msgPtr->padXPtr); + } Tk_GetPixelsFromObj(NULL, msgPtr->tkwin, msgPtr->padXPtr, &msgPtr->padX); if (msgPtr->padX < 0) { if (strcmp(Tcl_GetString(msgPtr->padXPtr), "-1")) { @@ -566,6 +570,10 @@ MessageWorldChanged( } msgPtr->padX = fm.ascent / 2; } + if (!msgPtr->padYPtr) { + msgPtr->padYPtr = Tcl_NewIntObj(-1); + Tcl_IncrRefCount(msgPtr->padYPtr); + } Tk_GetPixelsFromObj(NULL, msgPtr->tkwin, msgPtr->padYPtr, &msgPtr->padY); if (msgPtr->padY < 0) { if (strcmp(Tcl_GetString(msgPtr->padYPtr), "-1")) { |