Be consistent about using TKLog and add one new log message.

3 files changed, 13 insertions, 12 deletions

diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 22842b3..f79185e 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -91,7 +91,7 @@ unsigned short releaseCode;
 	//	w = [self windowWithWindowNumber:[theEvent windowNumber]];
 	w = [theEvent window];
 #if defined(TK_MAC_DEBUG_EVENTS) || NS_KEYLOG == 1
-	NSLog(@"-[%@(%p) %s] r=%d mods=%u '%@' '%@' code=%u c=%d %@ %d", [self class], self, _cmd, repeat, modifiers, characters, charactersIgnoringModifiers, keyCode,([charactersIgnoringModifiers length] == 0) ? 0 : [charactersIgnoringModifiers characterAtIndex: 0], w, type);
+	TKLog(@"-[%@(%p) %s] r=%d mods=%u '%@' '%@' code=%u c=%d %@ %d", [self class], self, _cmd, repeat, modifiers, characters, charactersIgnoringModifiers, keyCode,([charactersIgnoringModifiers length] == 0) ? 0 : [charactersIgnoringModifiers characterAtIndex: 0], w, type);
 #endif
 	break;
 
@@ -246,7 +246,7 @@ unsigned short releaseCode;
   XEvent xEvent;
 
   if (NS_KEYLOG)
-    NSLog (@"insertText '%@'\tlen = %d", aString, len);
+    TKLog (@"insertText '%@'\tlen = %d", aString, len);
   processingCompose = NO;
   finishedCompose = YES;
 
@@ -279,7 +279,7 @@ unsigned short releaseCode;
   NSString *str = [aString respondsToSelector: @selector (string)] ?
     [aString string] : aString;
   if (NS_KEYLOG)
-    NSLog (@"setMarkedText '%@' len =%lu range %lu from %lu", str,
+    TKLog (@"setMarkedText '%@' len =%lu range %lu from %lu", str,
 	   (unsigned long) [str length], (unsigned long) selRange.length,
 	   (unsigned long) selRange.location);
 
@@ -306,7 +306,7 @@ unsigned short releaseCode;
   NSRange rng = privateWorkingText != nil
     ? NSMakeRange (0, [privateWorkingText length]) : NSMakeRange (NSNotFound, 0);
   if (NS_KEYLOG)
-    NSLog (@"markedRange request");
+    TKLog (@"markedRange request");
   return rng;
 }
 
@@ -314,7 +314,7 @@ unsigned short releaseCode;
 - (void)unmarkText
 {
   if (NS_KEYLOG)
-    NSLog (@"unmark (accept) text");
+    TKLog (@"unmark (accept) text");
   [self deleteWorkingText];
   processingCompose = NO;
 }
@@ -349,7 +349,7 @@ unsigned short releaseCode;
 - (void)doCommandBySelector: (SEL)aSelector
 {
   if (NS_KEYLOG)
-    NSLog (@"doCommandBySelector: %@", NSStringFromSelector (aSelector));
+    TKLog (@"doCommandBySelector: %@", NSStringFromSelector (aSelector));
   processingCompose = NO;
   if (aSelector == @selector (deleteBackward:))
     {
@@ -379,7 +379,7 @@ unsigned short releaseCode;
 - (NSRange)selectedRange
 {
   if (NS_KEYLOG)
-    NSLog (@"selectedRange request");
+    TKLog (@"selectedRange request");
   return NSMakeRange (NSNotFound, 0);
 }
 
@@ -387,7 +387,7 @@ unsigned short releaseCode;
 - (NSUInteger)characterIndexForPoint: (NSPoint)thePoint
 {
   if (NS_KEYLOG)
-    NSLog (@"characterIndexForPoint request");
+    TKLog (@"characterIndexForPoint request");
   return 0;
 }
 
@@ -397,7 +397,7 @@ unsigned short releaseCode;
   static NSAttributedString *str = nil;
   if (str == nil) str = [NSAttributedString new];
   if (NS_KEYLOG)
-    NSLog (@"attributedSubstringFromRange request");
+    TKLog (@"attributedSubstringFromRange request");
   return str;
 }
 /* End <NSTextInput> impl. */
@@ -411,7 +411,7 @@ unsigned short releaseCode;
   if (privateWorkingText == nil)
     return;
   if (NS_KEYLOG)
-    NSLog(@"deleteWorkingText len = %lu\n",
+    TKLog(@"deleteWorkingText len = %lu\n",
 	    (unsigned long)[privateWorkingText length]);
   [privateWorkingText release];
   privateWorkingText = nil;
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 0927693..3e22311 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -386,7 +386,7 @@ GenerateUpdates(
     Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
 
 #ifdef TK_MAC_DEBUG_DRAWING
-    NSLog(@"Expose %p {{%d, %d}, {%d, %d}}", event.xany.window, event.xexpose.x,
+    TKLog(@"Expose %p {{%d, %d}, {%d, %d}}", event.xany.window, event.xexpose.x,
 	event.xexpose.y, event.xexpose.width, event.xexpose.height);
 #endif
 
@@ -836,6 +836,7 @@ ConfigureRestrictProc(
      * We do not allow recursive calls to drawRect.
      */
     if ([NSApp isDrawing]) {
+	TKLog(@"WARNING: a recursive call to drawRect was aborted.");
 	return;
     }
     [NSApp setIsDrawing: YES];
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 792e8b8..d0f8b24 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -411,7 +411,7 @@ NSStatusItem *exitFullScreen;
 	  TkMacOSXMakeFullscreen(winPtr, self, 1, interp);
       }
   } else {
-      NSLog (@"toggleFullScreen is ignored by Tk on OSX versions < 10.13");
+      TKLog (@"toggleFullScreen is ignored by Tk on OSX versions < 10.13");
   }
 }