From c03a103ca11b8710b13b35b4bf5de0b46379d89c Mon Sep 17 00:00:00 2001 From: culler Date: Thu, 23 May 2024 16:55:00 +0000 Subject: Clean up. --- generic/tkGrab.c | 1 - generic/tkPointer.c | 1 - macosx/tkMacOSXWindowEvent.c | 22 ++++++++++++---------- win/tkWinWm.c | 2 -- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/generic/tkGrab.c b/generic/tkGrab.c index 2c7c6ab..d4ecdb0 100644 --- a/generic/tkGrab.c +++ b/generic/tkGrab.c @@ -1102,7 +1102,6 @@ TkInOutEvents( } } } - fflush(stderr); } /* diff --git a/generic/tkPointer.c b/generic/tkPointer.c index 9f88d2f..c2ba29f 100644 --- a/generic/tkPointer.c +++ b/generic/tkPointer.c @@ -513,7 +513,6 @@ TkPointerDeadWindow( TkpSetCapture(NULL); } } - fflush(stderr); } /* diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 41c9ede..fc7acfd 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -250,15 +250,15 @@ extern NSString *NSWindowDidOrderOffScreenNotification; } } -//- (void) windowMapped: (NSNotification *) notification -//{ -// NSWindow *w = [notification object]; -// TkWindow *winPtr = TkMacOSXGetTkWindow(w); +- (void) windowMapped: (NSNotification *) notification +{ + NSWindow *w = [notification object]; + TkWindow *winPtr = TkMacOSXGetTkWindow(w); -// if (winPtr) { -// while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {} -// } -//} + if (winPtr) { + while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {} + } +} - (void) windowLiveResize: (NSNotification *) notification { @@ -284,9 +284,11 @@ extern NSString *NSWindowDidOrderOffScreenNotification; NSWindow *w = [notification object]; TkWindow *winPtr = TkMacOSXGetTkWindow(w); +#if 0 if (winPtr) { - //Tk_UnmapWindow((Tk_Window)winPtr); + Tk_UnmapWindow((Tk_Window)winPtr); } +#endif } #endif /* TK_MAC_DEBUG_NOTIFICATIONS */ @@ -304,7 +306,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; observe(NSWindowDidResizeNotification, windowBoundsChanged:); observe(NSWindowDidDeminiaturizeNotification, windowExpanded:); observe(NSWindowDidMiniaturizeNotification, windowCollapsed:); - //observe(NSWindowWillOrderOnScreenNotification, windowMapped:); + observe(NSWindowWillOrderOnScreenNotification, windowMapped:); observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:); observe(NSWindowWillStartLiveResizeNotification, windowLiveResize:); observe(NSWindowDidEndLiveResizeNotification, windowLiveResize:); diff --git a/win/tkWinWm.c b/win/tkWinWm.c index a550302..df9b1ce 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -2750,8 +2750,6 @@ TkWmDeadWindow( */ CheckForPointer(winPtr); - //TkPointerDeadWindow(winPtr); - ckfree(wmPtr); winPtr->wmInfoPtr = NULL; } -- cgit v0.12