Attachment "88cfdcb3.diff" to
ticket [88cfdcb3]
added by
chrstphrchvz
2022-02-10 02:56:53.
diff --git macosx/tkMacOSXDialog.c macosx/tkMacOSXDialog.c
index f6b8357ed..9545b8162 100644
--- macosx/tkMacOSXDialog.c
+++ macosx/tkMacOSXDialog.c
@@ -254,12 +254,6 @@ getFileURL(
} else if (returnCode == modalCancel) {
Tcl_ResetResult(callbackInfo->interp);
}
- if (callbackInfo->cmdObj) {
- Tcl_DecrRefCount(callbackInfo->cmdObj);
- }
- if (callbackInfo) {
- ckfree(callbackInfo);
- }
[NSApp stopModalWithCode:returnCode];
}
@@ -293,10 +287,6 @@ getFileURL(
if ([alert window] == [NSApp modalWindow]) {
[NSApp stopModalWithCode:returnCode];
}
- if (callbackInfo->cmdObj) {
- Tcl_DecrRefCount(callbackInfo->cmdObj);
- ckfree(callbackInfo);
- }
}
- (void)selectFormat:(id)sender {
@@ -833,7 +823,6 @@ Tk_GetOpenFileObjCmd(
}
Tcl_IncrRefCount(cmdObj);
}
- callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
callbackInfo->cmdObj = cmdObj;
callbackInfo->interp = interp;
callbackInfo->multiple = multiple;
@@ -850,6 +839,9 @@ Tk_GetOpenFileObjCmd(
parentIsKey = False;
}
modalReturnCode = showOpenSavePanel(openpanel, parent, callbackInfo);
+ if (cmdObj) {
+ Tcl_DecrRefCount(cmdObj);
+ }
result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
if (parentIsKey) {
[parent makeKeyWindow];
@@ -1109,7 +1101,6 @@ Tk_GetSaveFileObjCmd(
}
Tcl_IncrRefCount(cmdObj);
}
- callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
callbackInfo->cmdObj = cmdObj;
callbackInfo->interp = interp;
callbackInfo->multiple = 0;
@@ -1136,6 +1127,9 @@ Tk_GetSaveFileObjCmd(
parentIsKey = False;
}
modalReturnCode = showOpenSavePanel(savepanel, parent, callbackInfo);
+ if (cmdObj) {
+ Tcl_DecrRefCount(cmdObj);
+ }
result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
if (parentIsKey) {
[parent makeKeyWindow];
@@ -1258,7 +1252,6 @@ Tk_ChooseDirectoryObjCmd(
}
Tcl_IncrRefCount(cmdObj);
}
- callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
callbackInfo->cmdObj = cmdObj;
callbackInfo->interp = interp;
callbackInfo->multiple = 0;
@@ -1281,6 +1274,9 @@ Tk_ChooseDirectoryObjCmd(
parentIsKey = False;
}
modalReturnCode = showOpenSavePanel(panel, parent, callbackInfo);
+ if (cmdObj) {
+ Tcl_DecrRefCount(cmdObj);
+ }
result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
if (parentIsKey) {
[parent makeKeyWindow];
@@ -1499,7 +1495,6 @@ Tk_MessageBoxObjCmd(
}
Tcl_IncrRefCount(cmdObj);
}
- callbackInfo = (AlertCallbackInfo *)ckalloc(sizeof(AlertCallbackInfo));
callbackInfo->cmdObj = cmdObj;
callbackInfo->interp = interp;
callbackInfo->typeIndex = typeIndex;
@@ -1526,6 +1521,9 @@ Tk_MessageBoxObjCmd(
[NSApp tkAlertDidEnd:alert returnCode:modalReturnCode
contextInfo:callbackInfo];
}
+ if (cmdObj) {
+ Tcl_DecrRefCount(cmdObj);
+ }
result = (modalReturnCode >= NSAlertFirstButtonReturn) ? TCL_OK : TCL_ERROR;
end:
[alert release];