diff options
| author | hobbs <hobbs> | 2001-09-21 21:26:09 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2001-09-21 21:26:09 (GMT) |
| commit | 30d712282f4193c9a32da3dc31aef38bdca5ab22 (patch) | |
| tree | 45d959702900bded34a9a4709b145a277824090c | |
| parent | 12236f9c2da01c87e26fb17daa3c516304639a7b (diff) | |
| download | tk-30d712282f4193c9a32da3dc31aef38bdca5ab22.zip tk-30d712282f4193c9a32da3dc31aef38bdca5ab22.tar.gz tk-30d712282f4193c9a32da3dc31aef38bdca5ab22.tar.bz2 | |
(TkGetServerInfo): added recognition of Win64
| -rw-r--r-- | win/tkWinX.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/win/tkWinX.c b/win/tkWinX.c index a2505f7..3599bd0 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinX.c,v 1.14 2001/06/23 02:15:18 mdejong Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.15 2001/09/21 21:26:09 hobbs Exp $ */ #include "tkWinInt.h" @@ -96,8 +96,14 @@ TkGetServerInfo(interp, tkwin) os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx(&os); - sprintf(buffer, "Windows %d.%d %d Win32", os.dwMajorVersion, - os.dwMinorVersion, os.dwBuildNumber); + sprintf(buffer, "Windows %d.%d %d %s", os.dwMajorVersion, + os.dwMinorVersion, os.dwBuildNumber, +#ifdef _WIN64 + "Win64" +#else + "Win32" +#endif + ); Tcl_SetResult(interp, buffer, TCL_VOLATILE); } @@ -351,7 +357,7 @@ TkpOpenDisplay(display_name) twdPtr->window.winPtr = NULL; twdPtr->window.handle = NULL; screen->root = (Window)twdPtr; - + /* * On windows, when creating a color bitmap, need two pieces of * information: the number of color planes and the number of |