diff options
| author | marc_culler <marc.culler@gmail.com> | 2021-11-26 16:37:16 (GMT) |
|---|---|---|
| committer | marc_culler <marc.culler@gmail.com> | 2021-11-26 16:37:16 (GMT) |
| commit | 882508b6647ecdd39e466b221da486cd3dd35ad9 (patch) | |
| tree | ce3a11f53e8b85041e0dd69bae7a82c8557facc1 | |
| parent | 192118d1da42c1b8441a4a680313f75fc2d56ada (diff) | |
| download | tk-882508b6647ecdd39e466b221da486cd3dd35ad9.zip tk-882508b6647ecdd39e466b221da486cd3dd35ad9.tar.gz tk-882508b6647ecdd39e466b221da486cd3dd35ad9.tar.bz2 | |
Fix botched merge of tkMacOSXHLEvents.c and some unused parameter warnings.
| -rw-r--r-- | macosx/tkMacOSXHLEvents.c | 8 | ||||
| -rw-r--r-- | macosx/tkMacOSXPrint.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c index aefc63c..e781dff 100644 --- a/macosx/tkMacOSXHLEvents.c +++ b/macosx/tkMacOSXHLEvents.c @@ -237,9 +237,7 @@ static const char getSdefProc[] = "::tk::mac::GetDynamicSdef"; AEInfo->interp = _eventInterp; AEInfo->procedure = openDocumentProc; AEInfo->replyEvent = nil; - Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo); AEInfo->retryCount = 0; - if (Tcl_FindCommand(_eventInterp, "::tk::mac::OpenDocuments", NULL, 0)){ ProcessAppleEvent((ClientData)AEInfo); } else { @@ -263,7 +261,6 @@ static const char getSdefProc[] = "::tk::mac::GetDynamicSdef"; AEInfo->interp = _eventInterp; AEInfo->procedure = printDocProc; AEInfo->replyEvent = nil; - Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo); AEInfo->retryCount = 0; ProcessAppleEvent((ClientData)AEInfo); } @@ -326,7 +323,6 @@ static const char getSdefProc[] = "::tk::mac::GetDynamicSdef"; AEInfo->interp = _eventInterp; AEInfo->procedure = scriptFileProc; AEInfo->replyEvent = nil; - Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo); AEInfo->retryCount = 0; ProcessAppleEvent((ClientData)AEInfo); } @@ -358,7 +354,6 @@ static const char getSdefProc[] = "::tk::mac::GetDynamicSdef"; ProcessAppleEvent(AEInfo); } else { AEInfo->replyEvent = nil; - Tcl_DoWhenIdle(ProcessAppleEvent, AEInfo); ProcessAppleEvent(AEInfo); } } @@ -382,7 +377,6 @@ static const char getSdefProc[] = "::tk::mac::GetDynamicSdef"; AEInfo->interp = _eventInterp; AEInfo->procedure = launchURLProc; AEInfo->replyEvent = nil; - Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo); AEInfo->retryCount = 0; ProcessAppleEvent((ClientData)AEInfo); } @@ -390,6 +384,7 @@ static const char getSdefProc[] = "::tk::mac::GetDynamicSdef"; - (void)handleGetSDEFEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent { AppleEventInfo *AEInfo = (AppleEventInfo *)ckalloc(sizeof(AppleEventInfo)); Tcl_DString *sdefCommand = &AEInfo->command; + (void)event; (void)replyEvent; Tcl_DStringInit(sdefCommand); @@ -397,7 +392,6 @@ static const char getSdefProc[] = "::tk::mac::GetDynamicSdef"; AEInfo->interp = _eventInterp; AEInfo->procedure = getSdefProc; AEInfo->replyEvent = nil; - Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo); AEInfo->retryCount = 0; ProcessAppleEvent((ClientData)AEInfo); diff --git a/macosx/tkMacOSXPrint.c b/macosx/tkMacOSXPrint.c index 38cd1ca..ffaa972 100644 --- a/macosx/tkMacOSXPrint.c +++ b/macosx/tkMacOSXPrint.c @@ -48,10 +48,14 @@ int MacPrint_Init(Tcl_Interp * interp); - (void) printPanelDidEnd: (NSPrintPanel *) printPanel returnCode: (int) returnCode contextInfo: (void *) contextInfo { + (void) printPanel; + (void) contextInfo; + /* * Pass returnCode to FinishPrint function to determine how to * handle. */ + FinishPrint(fileName, returnCode); } @end diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index edd6c68..56d69b2 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -1277,6 +1277,8 @@ static const char *const accentNames[] = { change:(NSDictionary *)change context:(void *)context { + (void) change; + (void) context; NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults]; if (object == preferences && [keyPath isEqualToString:@"AppleHighlightColor"]) { if (@available(macOS 10.14, *)) { |