Tk Source Code

Changes On Branch bug-3382424
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch bug-3382424 Excluding Merge-Ins

This is equivalent to a diff from b8650961 to b1bebcb9

2017-12-05
16:07
Merge branch bug-3382424 into core-8-6-branch. Prevents misleading error messages during testing on macOS. check-in: 6628853f user: culler tags: core-8-6-branch
03:46
Remove unnecessary calls to set application icon in bundled apps on macOS, prevents custom icon from displaying check-in: 0ccde65f user: kevin_walzer tags: core-8-6-branch
2017-12-03
18:58
Remove two debug messages which print to stderr during macOS tests but are not really errors. Closed-Leaf check-in: b1bebcb9 user: culler tags: bug-3382424
17:16
Fix alphabetical order for widget-specific options in the man page for radiobutton. Thanks to Adil Gourinda. check-in: c0473bd1 user: fvogel tags: adil_manpages
2017-12-01
19:59
Remove 'unix' constraint for menuDraw-16.5 since this test now passes on all plaftorms thanks to [d4320eb0] and [61c642d3]. check-in: 63728f58 user: fvogel tags: trunk
19:55
Remove 'unix' constraint for menuDraw-16.5 since this test now passes on all plaftorms thanks to [d4320eb0] and [61c642d3]. check-in: b8650961 user: fvogel tags: core-8-6-branch
2017-11-30
15:06
Add missing code to run the postcommand in TkpPostMenu for macOS. Fixes [13d63d2794]. check-in: d4320eb0 user: culler tags: core-8-6-branch

Changes to macosx/tkMacOSXEmbed.c.

796
797
798
799
800
801
802
803



804
805

806
807
808
809
810
811
812
    XEvent *eventPtr)		/* ResizeRequest event. */
{
    TkWindow *winPtr = clientData;
    Container *containerPtr;
    Tk_ErrorHandler errHandler;

    if (!firstContainerPtr) {
	TkMacOSXDbgMsg("Embedded window has nil container.");



	return;
    }

    /*
     * Ignore any X protocol errors that happen in this procedure (almost any
     * operation could fail, for example, if the embedded application has
     * deleted its window).
     */

    errHandler = Tk_CreateErrorHandler(eventPtr->xfocus.display, -1,







<
>
>
>


>







796
797
798
799
800
801
802

803
804
805
806
807
808
809
810
811
812
813
814
815
    XEvent *eventPtr)		/* ResizeRequest event. */
{
    TkWindow *winPtr = clientData;
    Container *containerPtr;
    Tk_ErrorHandler errHandler;

    if (!firstContainerPtr) {

	/*
	 * When the interpreter is being dismantled this can be nil.
	 */
	return;
    }
    
    /*
     * Ignore any X protocol errors that happen in this procedure (almost any
     * operation could fail, for example, if the embedded application has
     * deleted its window).
     */

    errHandler = Tk_CreateErrorHandler(eventPtr->xfocus.display, -1,

Changes to macosx/tkMacOSXInit.c.

283
284
285
286
287
288
289

290

291
292
293
294
295
296
297
	 * framework scripts directory.
	 * FIXME: Should we come up with a more generic way of doing this?
	 */

	if (Tcl_MacOSXOpenVersionedBundleResources(interp,
		"com.tcltk.tklibrary", TK_FRAMEWORK_VERSION, 0, PATH_MAX,
		tkLibPath) != TCL_OK) {

	    TkMacOSXDbgMsg("Tcl_MacOSXOpenVersionedBundleResources failed");

	}
#endif

	/*
	 * FIXME: Close stdin & stdout for remote debugging otherwise we will
	 * fight with gdb for stdin & stdout
	 */







>

>







283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
	 * framework scripts directory.
	 * FIXME: Should we come up with a more generic way of doing this?
	 */

	if (Tcl_MacOSXOpenVersionedBundleResources(interp,
		"com.tcltk.tklibrary", TK_FRAMEWORK_VERSION, 0, PATH_MAX,
		tkLibPath) != TCL_OK) {
            # if 0 /* This is not really an error.  Wish still runs fine. */
	    TkMacOSXDbgMsg("Tcl_MacOSXOpenVersionedBundleResources failed");
	    # endif
	}
#endif

	/*
	 * FIXME: Close stdin & stdout for remote debugging otherwise we will
	 * fight with gdb for stdin & stdout
	 */