From bcd20424a5cf76ad6d464be73fe07aa2adc70e4e Mon Sep 17 00:00:00 2001 From: fvogel Date: Tue, 28 Mar 2023 20:14:56 +0000 Subject: Fix [ee0847f633]: Aqua: compiler warning in debug builds. --- macosx/tkMacOSXDialog.c | 2 +- macosx/tkMacOSXEvent.c | 2 +- macosx/tkMacOSXInit.c | 2 +- macosx/tkMacOSXKeyEvent.c | 4 ++-- macosx/tkMacOSXKeyboard.c | 2 +- macosx/tkMacOSXMenu.c | 4 ++-- macosx/tkMacOSXMouseEvent.c | 2 +- macosx/tkMacOSXWindowEvent.c | 30 +++++++++++++++--------------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 5170545..2e38866 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -1657,7 +1657,7 @@ enum FontchooserOption { - (void) windowDidOrderOffScreen: (NSNotification *)notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif if ([[notification object] isEqual:[[NSFontManager sharedFontManager] fontPanel:NO]]) { diff --git a/macosx/tkMacOSXEvent.c b/macosx/tkMacOSXEvent.c index 31a7663..6afaca4 100644 --- a/macosx/tkMacOSXEvent.c +++ b/macosx/tkMacOSXEvent.c @@ -27,7 +27,7 @@ enum { - (NSEvent *) tkProcessEvent: (NSEvent *) theEvent { #ifdef TK_MAC_DEBUG_EVENTS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), theEvent); #endif NSEvent *processedEvent = theEvent; NSEventType type = [theEvent type]; diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index a9b459a..0ddf627 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -112,7 +112,7 @@ static int TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip, #ifdef TK_MAC_DEBUG_NOTIFICATIONS - (void) _postedNotification: (NSNotification *) notification { - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); } #endif diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c index 961072f..a6ab89b 100644 --- a/macosx/tkMacOSXKeyEvent.c +++ b/macosx/tkMacOSXKeyEvent.c @@ -47,7 +47,7 @@ static NSUInteger textInputModifiers; - (NSEvent *) tkProcessKeyEvent: (NSEvent *) theEvent { #ifdef TK_MAC_DEBUG_EVENTS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), theEvent); #endif NSWindow *w = [theEvent window]; TkWindow *winPtr = TkMacOSXGetTkWindow(w), *grabWinPtr, *focusWinPtr; @@ -146,7 +146,7 @@ static NSUInteger textInputModifiers; #if defined(TK_MAC_DEBUG_EVENTS) || NS_KEYLOG == 1 TKLog(@"-[%@(%p) %s] repeat=%d mods=%x char=%x code=%lu c=%d type=%d", - [self class], self, _cmd, + [self class], self, sel_getName(_cmd), (type == NSKeyDown) && [theEvent isARepeat], modifiers, keychar, virt, w, type); #endif diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c index fe2991e..2e43258 100644 --- a/macosx/tkMacOSXKeyboard.c +++ b/macosx/tkMacOSXKeyboard.c @@ -153,7 +153,7 @@ static int KeyDataToUnicode(UniChar *uniChars, int maxChars, { (void)notification; #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #else (void)notification; #endif diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index c10944a..f853abe 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -501,7 +501,7 @@ static Bool runMenuCommand = true; { (void)notification; #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif if (backgroundLoop) { [backgroundLoop cancel]; @@ -522,7 +522,7 @@ static Bool runMenuCommand = true; { (void)notification; #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif if (backgroundLoop) { [backgroundLoop cancel]; diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c index e33f787..0286343 100644 --- a/macosx/tkMacOSXMouseEvent.c +++ b/macosx/tkMacOSXMouseEvent.c @@ -98,7 +98,7 @@ enum { static NSTimeInterval timestamp = 0; #ifdef TK_MAC_DEBUG_EVENTS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), theEvent); #endif /* diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index ef8e958..ab776c0 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -50,7 +50,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (void) windowActivation: (NSNotification *) notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif NSWindow *w = [notification object]; TkWindow *winPtr = TkMacOSXGetTkWindow(w); @@ -85,7 +85,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (void) windowBoundsChanged: (NSNotification *) notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif BOOL movedOnly = [[notification name] isEqualToString:NSWindowDidMoveNotification]; @@ -123,7 +123,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (void) windowExpanded: (NSNotification *) notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif NSWindow *w = [notification object]; TkWindow *winPtr = TkMacOSXGetTkWindow(w); @@ -180,7 +180,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (void) windowEnteredFullScreen: (NSNotification *) notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif if (![[notification object] respondsToSelector: @selector (tkLayoutChanged)]) { return; @@ -191,7 +191,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (void) windowExitedFullScreen: (NSNotification *) notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif if (![[notification object] respondsToSelector: @selector (tkLayoutChanged)]) { return; @@ -202,7 +202,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (void) windowCollapsed: (NSNotification *) notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif NSWindow *w = [notification object]; TkWindow *winPtr = TkMacOSXGetTkWindow(w); @@ -216,7 +216,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (BOOL) windowShouldClose: (NSWindow *) w { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, w); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), w); #endif TkWindow *winPtr = TkMacOSXGetTkWindow(w); @@ -275,12 +275,12 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (void) windowDragStart: (NSNotification *) notification { - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); } - (void) windowUnmapped: (NSNotification *) notification { - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); NSWindow *w = [notification object]; TkWindow *winPtr = TkMacOSXGetTkWindow(w); @@ -342,7 +342,7 @@ static void RefocusGrabWindow(void *data) { (void)notification; #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif [NSApp tkCheckPasteboard]; @@ -377,7 +377,7 @@ static void RefocusGrabWindow(void *data) { (void)notification; #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif /* @@ -415,7 +415,7 @@ static void RefocusGrabWindow(void *data) { - (void) applicationShowHide: (NSNotification *) notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif const char *cmd = ([[notification name] isEqualToString: NSApplicationDidUnhideNotification] ? @@ -436,7 +436,7 @@ static void RefocusGrabWindow(void *data) { (void)notification; #ifdef TK_MAC_DEBUG_NOTIFICATIONS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification); #endif TkDisplay *dispPtr = TkGetDisplayList(); @@ -1299,7 +1299,7 @@ static const char *const accentNames[] = { - (void) tkToolbarButton: (id) sender { #ifdef TK_MAC_DEBUG_EVENTS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd)); #endif union {XEvent general; XVirtualEvent virt;} event; int x, y; @@ -1352,7 +1352,7 @@ static const char *const accentNames[] = { (void)theEvent; #ifdef TK_MAC_DEBUG_EVENTS - TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent); + TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), theEvent); #endif } -- cgit v0.12