diff options
| author | hobbs <hobbs@noemail.net> | 2001-11-10 00:58:50 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2001-11-10 00:58:50 (GMT) |
| commit | 8406a38b0f12ce6c95264507e762dde4c3606c75 (patch) | |
| tree | c9f7b72e38056d27ab878e183527d70a558529f5 /win/rc | |
| parent | b515c70a0c84cd50d0644bfb9139867a67e9fcb1 (diff) | |
| download | tk-8406a38b0f12ce6c95264507e762dde4c3606c75.zip tk-8406a38b0f12ce6c95264507e762dde4c3606c75.tar.gz tk-8406a38b0f12ce6c95264507e762dde4c3606c75.tar.bz2 | |
* win/tkWinX.c (TkWinXInit): added InitCommonControlsEx call.
* win/rc/tk.rc:
* win/rc/wish.rc:
* win/rc/wish.exe.manifest: added resources that specify using v6
of the MS Common Controls library when available (WinXP+). This
enables use of the themeable widgets (like scrollbars) to be used
in Tk. [Patch #478933]
FossilOrigin-Name: 7cd5f27018339066c27d50626bb19e752fba4111
Diffstat (limited to 'win/rc')
| -rw-r--r-- | win/rc/tk.rc | 14 | ||||
| -rw-r--r-- | win/rc/wish.exe.manifest | 22 | ||||
| -rw-r--r-- | win/rc/wish.rc | 14 |
3 files changed, 48 insertions, 2 deletions
diff --git a/win/rc/tk.rc b/win/rc/tk.rc index cdc1e6d..bdca9cd 100644 --- a/win/rc/tk.rc +++ b/win/rc/tk.rc @@ -1,4 +1,4 @@ -// RCS: @(#) $Id: tk.rc,v 1.7 2001/10/01 21:04:07 hobbs Exp $ +// RCS: @(#) $Id: tk.rc,v 1.8 2001/11/10 00:58:51 hobbs Exp $ // // Version Resource Script // @@ -67,3 +67,15 @@ END // #include "tk_base.rc" + +// +// This enables themed scrollbars in XP by trying to use comctl32 v6. +// + +#ifndef RT_MANIFEST +#define RT_MANIFEST 24 +#endif +#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#endif +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "wish.exe.manifest" diff --git a/win/rc/wish.exe.manifest b/win/rc/wish.exe.manifest new file mode 100644 index 0000000..424000f --- /dev/null +++ b/win/rc/wish.exe.manifest @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="8.4.0.4" + processorArchitecture="X86" + name="Tcl.Tk.wish" + type="win32" +/> +<description>Tcl/Tk windowing shell (wish)</description> +<dependency> +<dependentAssembly> +<assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" +/> +</dependentAssembly> +</dependency> +</assembly> diff --git a/win/rc/wish.rc b/win/rc/wish.rc index 7d6ce2c..d10a200 100644 --- a/win/rc/wish.rc +++ b/win/rc/wish.rc @@ -1,4 +1,4 @@ -// RCS: @(#) $Id: wish.rc,v 1.6 2001/10/01 21:04:07 hobbs Exp $ +// RCS: @(#) $Id: wish.rc,v 1.7 2001/11/10 00:58:51 hobbs Exp $ // // Version Resource Script // @@ -79,3 +79,15 @@ app ICON DISCARDABLE "wish.ico" #ifdef STATIC_BUILD #include "tk_base.rc" #endif + +// +// This enables themed scrollbars in XP by trying to use comctl32 v6. +// + +#ifndef RT_MANIFEST +#define RT_MANIFEST 24 +#endif +#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#endif +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "wish.exe.manifest" |