diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-20 15:39:06 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-20 15:39:06 (GMT) |
| commit | da70d24c1529ed14e9b303d054436f4d7771b610 (patch) | |
| tree | 9976f13324cf0bd237211a28a8128ba6ed808df8 | |
| parent | 73cd4c1a39143ee2ad2c2bb4dcb84ef52d196797 (diff) | |
| parent | 857ad319e1e8ef85c537ede8d628c08de911f03f (diff) | |
| download | tk-da70d24c1529ed14e9b303d054436f4d7771b610.zip tk-da70d24c1529ed14e9b303d054436f4d7771b610.tar.gz tk-da70d24c1529ed14e9b303d054436f4d7771b610.tar.bz2 | |
Some bit of Windows 8.1 compatibility: See [http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx]
| -rw-r--r-- | win/tkWinMenu.c | 6 | ||||
| -rw-r--r-- | win/tkWinX.c | 12 | ||||
| -rw-r--r-- | win/ttkWinXPTheme.c | 6 | ||||
| -rw-r--r-- | win/wish.exe.manifest.in | 22 |
4 files changed, 34 insertions, 12 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index b7b5598..4593928 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -3194,7 +3194,7 @@ SetDefaults( int padding; #endif } nc; - OSVERSIONINFO os; + OSVERSIONINFOW os; /* * Set all of the default options. The loop will terminate when we run out @@ -3214,8 +3214,8 @@ SetDefaults( nc.metrics.cbSize = sizeof(nc); - os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&os); + os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&os); if (os.dwMajorVersion < 6) { nc.metrics.cbSize -= sizeof(int); } diff --git a/win/tkWinX.c b/win/tkWinX.c index 22edb60..86010e9 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -120,10 +120,10 @@ TkGetServerInfo( Tk_Window tkwin) /* Token for window; this selects a particular * display and server. */ { - OSVERSIONINFO os; + OSVERSIONINFOW os; - os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&os); + os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&os); Tcl_SetObjResult(interp, Tcl_ObjPrintf("Windows %d.%d %d %s", (int) os.dwMajorVersion, (int) os.dwMinorVersion, (int) os.dwBuildNumber, @@ -326,10 +326,10 @@ int TkWinGetPlatformId(void) { if (tkPlatformId == 0) { - OSVERSIONINFO os; + OSVERSIONINFOW os; - os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&os); + os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&os); tkPlatformId = os.dwPlatformId; /* diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index 1a5e934..08569a3 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -1259,10 +1259,10 @@ MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) HINSTANCE hlibrary; Ttk_Theme themePtr, parentPtr, vistaPtr; ElementInfo *infoPtr; - OSVERSIONINFO os; + OSVERSIONINFOW os; - os.dwOSVersionInfoSize = sizeof(os); - GetVersionEx(&os); + os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&os); procs = LoadXPThemeProcs(&hlibrary); if (!procs) diff --git a/win/wish.exe.manifest.in b/win/wish.exe.manifest.in index 2cae0c0..7db42e3 100644 --- a/win/wish.exe.manifest.in +++ b/win/wish.exe.manifest.in @@ -8,6 +8,28 @@ type="win32" /> <description>Tcl/Tk windowing shell (wish)</description> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> + </trustInfo> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!-- Windows 8.1 --> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + <!-- Windows 8 --> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!-- Windows 7 --> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!-- Windows Vista --> + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + </application> + </compatibility> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> |