Tk Source Code

Check-in [cdce7624]
Login

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

Overview
Comment:eliminate some warnings, caused by previous merge
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA1: cdce76242d5649ec60d76ac0a023b765a2551078
User & Date: jan.nijtmans 2012-06-07 08:23:36
Context
2012-06-07
09:32
some quoting issues, eliminate TCL_VARARGS_DEFINE check-in: 7b5b2dd5 user: jan.nijtmans tags: core-8-5-branch
08:32
merge from main 8.5 branch check-in: 4f521cd3 user: jan.nijtmans tags: tk-cocoa-8-5-backport
08:23
eliminate some warnings, caused by previous merge check-in: cdce7624 user: jan.nijtmans tags: core-8-5-branch
08:08
Change XChangeWindowAttributes signature and many others to match Xorg, needed for Cygwin check-in: 3bd080b9 user: jan.nijtmans tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkIntPlatDecls.h.

1187
1188
1189
1190
1191
1192
1193


1194
1195
1196
1197
1198
#ifdef __CYGWIN__
    void TkFreeXId(TkDisplay *dispPtr);
    void TkFreeWindowId(TkDisplay *dispPtr, Window w);
    void TkInitXId(TkDisplay *dispPtr);
#endif

#ifdef __WIN32__


#define TkpCmapStressed(tkwin,colormap) (0)
#define TkpSync(display)
#endif

#endif /* _TKINTPLATDECLS */







>
>





1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
#ifdef __CYGWIN__
    void TkFreeXId(TkDisplay *dispPtr);
    void TkFreeWindowId(TkDisplay *dispPtr, Window w);
    void TkInitXId(TkDisplay *dispPtr);
#endif

#ifdef __WIN32__
#undef TkpCmapStressed
#undef TkpSync
#define TkpCmapStressed(tkwin,colormap) (0)
#define TkpSync(display)
#endif

#endif /* _TKINTPLATDECLS */

Changes to win/tkWinPointer.c.

356
357
358
359
360
361
362

363
364
365
366
367
368
369
    int dest_x,
    int dest_y)
{
    RECT r;

    GetWindowRect(Tk_GetHWND(dest_w), &r);
    SetCursorPos(r.left+dest_x, r.top+dest_y);

}

/*
 *----------------------------------------------------------------------
 *
 * XGetInputFocus --
 *







>







356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
    int dest_x,
    int dest_y)
{
    RECT r;

    GetWindowRect(Tk_GetHWND(dest_w), &r);
    SetCursorPos(r.left+dest_x, r.top+dest_y);
    return Success;
}

/*
 *----------------------------------------------------------------------
 *
 * XGetInputFocus --
 *