diff options
| author | culler <culler> | 2019-08-14 18:09:38 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-08-14 18:09:38 (GMT) |
| commit | 56d3f1aa49e5e248212c377e40358621f3210101 (patch) | |
| tree | 8ed2d622908be5621541654361f1839f884c46dd /macosx | |
| parent | 6f6f9107f5c1723b2761954b3413dff0c6886eaa (diff) | |
| download | tk-56d3f1aa49e5e248212c377e40358621f3210101.zip tk-56d3f1aa49e5e248212c377e40358621f3210101.tar.gz tk-56d3f1aa49e5e248212c377e40358621f3210101.tar.bz2 | |
Fix typos in variable names for panel objects.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 61bd407..10a756d 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -344,17 +344,17 @@ static NSInteger showOpenSavePanel( NSInteger modalReturnCode; if (parent && ![parent attachedSheet] && [NSApp macMinorVersion] < 15) { - [openpanel beginSheetModalForWindow:parent + [panel beginSheetModalForWindow:parent completionHandler:^(NSInteger returnCode) { - [NSApp tkFilePanelDidEnd:openpanel + [NSApp tkFilePanelDidEnd:panel returnCode:returnCode contextInfo:callbackInfo ]; }]; modalReturnCode = callbackInfo->cmdObj ? modalOther : - [NSApp runModalForWindow:openpanel]; + [NSApp runModalForWindow:panel]; } else { - modalReturnCode = [openpanel runModal]; - [NSApp tkFilePanelDidEnd:openpanel returnCode:modalReturnCode + modalReturnCode = [panel runModal]; + [NSApp tkFilePanelDidEnd:panel returnCode:modalReturnCode contextInfo:callbackInfo]; } return modalReturnCode; @@ -1077,12 +1077,12 @@ Tk_GetSaveFileObjCmd( [savepanel setExtensionHidden:NO]; if (cmdObj) { - callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo)); if (Tcl_IsShared(cmdObj)) { cmdObj = Tcl_DuplicateObj(cmdObj); } Tcl_IncrRefCount(cmdObj); } + callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo)); callbackInfo->cmdObj = cmdObj; callbackInfo->interp = interp; callbackInfo->multiple = 0; @@ -1108,7 +1108,7 @@ Tk_GetSaveFileObjCmd( parent = nil; parentIsKey = False; } - modalReturnCode = showOpenSavePanel(openpanel, parent, callbackInfo); + modalReturnCode = showOpenSavePanel(savepanel, parent, callbackInfo); result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR; if (parentIsKey) { [parent makeKeyWindow]; @@ -1228,12 +1228,12 @@ Tk_ChooseDirectoryObjCmd( [panel setCanChooseDirectories:YES]; [panel setCanCreateDirectories:!mustexist]; if (cmdObj) { - callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo)); if (Tcl_IsShared(cmdObj)) { cmdObj = Tcl_DuplicateObj(cmdObj); } Tcl_IncrRefCount(cmdObj); } + callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo)); callbackInfo->cmdObj = cmdObj; callbackInfo->interp = interp; callbackInfo->multiple = 0; @@ -1255,7 +1255,7 @@ Tk_ChooseDirectoryObjCmd( parent = nil; parentIsKey = False; } - modalReturnCode = showOpenSavePanel(openpanel, parent, callbackInfo); + modalReturnCode = showOpenSavePanel(panel, parent, callbackInfo); result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR; if (parentIsKey) { [parent makeKeyWindow]; @@ -1524,12 +1524,12 @@ Tk_MessageBoxObjCmd( [[buttons objectAtIndex: defaultNativeButtonIndex-1] setKeyEquivalent: @"\r"]; if (cmdObj) { - callbackInfo = ckalloc(sizeof(AlertCallbackInfo)); if (Tcl_IsShared(cmdObj)) { cmdObj = Tcl_DuplicateObj(cmdObj); } Tcl_IncrRefCount(cmdObj); } + callbackInfo = ckalloc(sizeof(AlertCallbackInfo)); callbackInfo->cmdObj = cmdObj; callbackInfo->interp = interp; callbackInfo->typeIndex = typeIndex; |