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