Tk Source Code

Check-in [fba343f0]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

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

Overview
Comment:Propagate the call to TkpInitKeymapInfo in TkpOpenDisplay from Linux to Windows and macOS.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | bug6e8afe516d-87 | tip-532
Files: files | file ages | folders
SHA3-256: fba343f0c6cc52ee394ac0c1dba0189c28aaf5f15dff0500165172e43b745e67
User & Date: fvogel 2019-02-03 20:32:22
Context
2019-06-08
21:33
merge trunk check-in: af3d31f1 user: fvogel tags: bug6e8afe516d-87, tip-532
2019-02-03
20:32
Propagate the call to TkpInitKeymapInfo in TkpOpenDisplay from Linux to Windows and macOS. check-in: fba343f0 user: fvogel tags: bug6e8afe516d-87, tip-532
20:31
Propagate the call to TkpInitKeymapInfo in TkpOpenDisplay from Linux to macOS. check-in: 8ad2b2d0 user: fvogel tags: bug6e8afe516d, tip-532
17:28
rebase to trunk check-in: 2788c9d4 user: fvogel tags: bug6e8afe516d-87, tip-532
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXXStubs.c.

221
222
223
224
225
226
227






228
229
230
231
232
233
234
     * This is the quickest way to make sure that all the *Init flags get
     * properly initialized
     */

    bzero(gMacDisplay, sizeof(TkDisplay));
    gMacDisplay->display = display;
    [pool drain];






    return gMacDisplay;
}
 
/*
 *----------------------------------------------------------------------
 *
 * TkpCloseDisplay --






>
>
>
>
>
>







221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
     * This is the quickest way to make sure that all the *Init flags get
     * properly initialized
     */

    bzero(gMacDisplay, sizeof(TkDisplay));
    gMacDisplay->display = display;
    [pool drain];

    /*
     * Key map info must be available immediately, because of "send event".
     */
    TkpInitKeymapInfo(gMacDisplay);

    return gMacDisplay;
}
 
/*
 *----------------------------------------------------------------------
 *
 * TkpCloseDisplay --

Changes to win/tkWinX.c.

563
564
565
566
567
568
569





570
571
572
573
574
575
576
    tsdPtr->winDisplay = ckalloc(sizeof(TkDisplay));
    ZeroMemory(tsdPtr->winDisplay, sizeof(TkDisplay));
    tsdPtr->winDisplay->display = display;
    tsdPtr->updatingClipboard = FALSE;
    tsdPtr->wheelTickPrev = GetTickCount();
    tsdPtr->wheelAcc = 0;






    return tsdPtr->winDisplay;
}
 
/*
 *----------------------------------------------------------------------
 *
 * TkpCloseDisplay --






>
>
>
>
>







563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
    tsdPtr->winDisplay = ckalloc(sizeof(TkDisplay));
    ZeroMemory(tsdPtr->winDisplay, sizeof(TkDisplay));
    tsdPtr->winDisplay->display = display;
    tsdPtr->updatingClipboard = FALSE;
    tsdPtr->wheelTickPrev = GetTickCount();
    tsdPtr->wheelAcc = 0;

    /*
     * Key map info must be available immediately, because of "send event".
     */
    TkpInitKeymapInfo(tsdPtr->winDisplay);

    return tsdPtr->winDisplay;
}
 
/*
 *----------------------------------------------------------------------
 *
 * TkpCloseDisplay --