Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | fix bug [d1989fb7cf]: Root window appears before Tk_Mainloop is called. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | bug-d1989fb7cf |
| Files: | files | file ages | folders |
| SHA3-256: |
9e9a9189a87fb6d670b873d477ceb944 |
| User & Date: | culler 2019-05-15 16:55:50 |
References
|
2019-05-16
| ||
| 17:27 | • Ticket [d1989fb7] Aqua: Empty window appears after `package require Tk` status still Open with 4 other changes artifact: eebee168 user: chrstphrchvz | |
Context
|
2019-05-16
| ||
| 19:54 | Fix bug [d1989fb7cf]: In Aqua the root window appears before Tk_Mainloop is called. check-in: 364c9099 user: culler tags: core-8-6-branch | |
|
2019-05-15
| ||
| 16:55 | fix bug [d1989fb7cf]: Root window appears before Tk_Mainloop is called. Closed-Leaf check-in: 9e9a9189 user: culler tags: bug-d1989fb7cf | |
|
2019-05-13
| ||
| 09:26 | Fix [caa8cb25a8]: spelling fix in comment of tkMenuDraw.c check-in: 23c39bb0 user: fvogel tags: core-8-6-branch | |
Changes
Changes to macosx/tkMacOSXInit.c.
| ︙ | ︙ | |||
321 322 323 324 325 326 327 328 329 330 331 332 333 334 | [NSNumber numberWithInt:-1], @"NSStringDrawingTypesetterBehavior", nil]]; [TKApplication sharedApplication]; [pool drain]; [NSApp _setup:interp]; [NSApp finishLaunching]; /* * If we don't have a TTY and stdin is a special character file of * length 0, (e.g. /dev/null, which is what Finder sets when double * clicking Wish) then use the Tk based console interpreter. */ | > > > > > > > > > > > | 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 | [NSNumber numberWithInt:-1], @"NSStringDrawingTypesetterBehavior", nil]]; [TKApplication sharedApplication]; [pool drain]; [NSApp _setup:interp]; [NSApp finishLaunching]; Tk_MacOSXSetupTkNotifier(); /* * If the root window is mapped before the App has finished launching * it will open off screen (see ticket 56a1823c73). To avoid this we * ask Tk to process an event with no wait. We expect Tcl_DoOneEvent * to wait until the Mac event loop has been created and then return * immediately since the queue is empty. */ Tcl_DoOneEvent(TCL_WINDOW_EVENTS| TCL_DONT_WAIT); /* * If we don't have a TTY and stdin is a special character file of * length 0, (e.g. /dev/null, which is what Finder sets when double * clicking Wish) then use the Tk based console interpreter. */ |
| ︙ | ︙ | |||
357 358 359 360 361 362 363 |
if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
return TCL_ERROR;
}
}
}
| < < < < < < < < < < | 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 |
if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
return TCL_ERROR;
}
}
}
if (tkLibPath[0] != '\0') {
Tcl_SetVar2(interp, "tk_library", NULL, tkLibPath, TCL_GLOBAL_ONLY);
}
if (scriptPath[0] != '\0') {
Tcl_SetVar2(interp, "auto_path", NULL, scriptPath,
TCL_GLOBAL_ONLY|TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
}
Tcl_CreateObjCommand(interp, "::tk::mac::standardAboutPanel",
TkMacOSXStandardAboutPanelObjCmd, NULL, NULL);
Tcl_CreateObjCommand(interp, "::tk::mac::iconBitmap",
TkMacOSXIconBitmapObjCmd, NULL, NULL);
return TCL_OK;
}
/*
*----------------------------------------------------------------------
*
* TkpGetAppName --
|
| ︙ | ︙ |
Changes to macosx/tkMacOSXSubwindows.c.
| ︙ | ︙ | |||
164 165 166 167 168 169 170 |
[NSApp activateIgnoringOtherApps:NO];
[[win contentView] setNeedsDisplay:YES];
if ([win canBecomeKeyWindow]) {
[win makeKeyAndOrderFront:NSApp];
} else {
[win orderFrontRegardless];
}
| < < < < < < < < < | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 |
[NSApp activateIgnoringOtherApps:NO];
[[win contentView] setNeedsDisplay:YES];
if ([win canBecomeKeyWindow]) {
[win makeKeyAndOrderFront:NSApp];
} else {
[win orderFrontRegardless];
}
} else {
TkWindow *contWinPtr = TkpGetOtherWindow(winPtr);
/*
* Rebuild the container's clipping region and display
* the window.
*/
|
| ︙ | ︙ |