Check-in [ee2800d690]
Overview
Comment:Added patch for Tk 8.6 to workaround header inclusion issue
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:ee2800d690ec71a42560335bb03d0ab27437c7f7
User & Date: rkeene on 2014-11-19 04:59:59
Other Links: manifest | tags
Context
2014-11-19
20:56
Updated URL to a mirror of mk4tcl for now check-in: b1003b10ac user: rkeene tags: trunk
04:59
Added patch for Tk 8.6 to workaround header inclusion issue check-in: ee2800d690 user: rkeene tags: trunk
04:44
Updated to provide answers to run-time checks in Tcl check-in: 0ad7916e13 user: rkeene tags: trunk
Changes

Added tk/patches/all/tk-8.6-fixishellitem.diff version [988a4061b9].

            1  +--- tk8.6.3.orig/win/tkWinDialog.c	2014-10-25 11:50:40.000000000 -0500
            2  ++++ tk8.6.3-fixishellitem/win/tkWinDialog.c	2014-11-18 22:57:19.021033000 -0600
            3  +@@ -209,19 +209,9 @@
            4  +  * older compilers? Should we prefix definitions with Tcl_ instead
            5  +  * of using the same names as in the SDK?
            6  +  */
            7  +-#ifndef __IShellItemArray_INTERFACE_DEFINED__
            8  +-#define __IShellItemArray_INTERFACE_DEFINED__
            9  +-
           10  +-typedef enum SIATTRIBFLAGS {
           11  +-    SIATTRIBFLAGS_AND	= 0x1,
           12  +-    SIATTRIBFLAGS_OR	= 0x2,
           13  +-    SIATTRIBFLAGS_APPCOMPAT	= 0x3,
           14  +-    SIATTRIBFLAGS_MASK	= 0x3,
           15  +-    SIATTRIBFLAGS_ALLITEMS	= 0x4000
           16  +-} SIATTRIBFLAGS;
           17  ++#ifndef __IShellItem_INTERFACE_DEFINED__
           18  ++#  define __IShellItem_INTERFACE_DEFINED__
           19  + #ifdef __MSVCRT__
           20  +-typedef ULONG SFGAOF;
           21  +-
           22  + typedef struct IShellItem IShellItem;
           23  + 
           24  + typedef enum __MIDL_IShellItem_0001 {
           25  +@@ -250,6 +240,21 @@
           26  + struct IShellItem {
           27  +     CONST_VTBL struct IShellItemVtbl *lpVtbl;
           28  + };
           29  ++#endif
           30  ++#endif
           31  ++
           32  ++#ifndef __IShellItemArray_INTERFACE_DEFINED__
           33  ++#define __IShellItemArray_INTERFACE_DEFINED__
           34  ++
           35  ++typedef enum SIATTRIBFLAGS {
           36  ++    SIATTRIBFLAGS_AND	= 0x1,
           37  ++    SIATTRIBFLAGS_OR	= 0x2,
           38  ++    SIATTRIBFLAGS_APPCOMPAT	= 0x3,
           39  ++    SIATTRIBFLAGS_MASK	= 0x3,
           40  ++    SIATTRIBFLAGS_ALLITEMS	= 0x4000
           41  ++} SIATTRIBFLAGS;
           42  ++#ifdef __MSVCRT__
           43  ++typedef ULONG SFGAOF;
           44  + #endif /* __MSVCRT__ */
           45  + typedef struct IShellItemArray IShellItemArray;
           46  + typedef struct IShellItemArrayVtbl