diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-01 11:09:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-01 11:09:37 (GMT) |
| commit | bfa9e3fe55bd56a7da40c58a8d242cbe1b1120a9 (patch) | |
| tree | caa2028e644331aa1d753d3addac713b9a6485dc /generic | |
| parent | 1761e6a6e5cabd444b8a8781b78b6ab3819a8fa0 (diff) | |
| parent | d0502168bacfabd293335c1346f631e1021086df (diff) | |
| download | tk-bfa9e3fe55bd56a7da40c58a8d242cbe1b1120a9.zip tk-bfa9e3fe55bd56a7da40c58a8d242cbe1b1120a9.tar.gz tk-bfa9e3fe55bd56a7da40c58a8d242cbe1b1120a9.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkWindow.c | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 917eadd..523c41a 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -19,6 +19,7 @@ #elif !defined(MAC_OSX_TK) #include "tkUnixInt.h" #endif +#include "tkUuid.h" /* * Type used to keep track of Window objects that were only partially @@ -817,6 +818,11 @@ NameWindow( *---------------------------------------------------------------------- */ +#ifndef STRINGIFY +# define STRINGIFY(x) STRINGIFY1(x) +# define STRINGIFY1(x) #x +#endif + Tk_Window TkCreateMainWindow( Tcl_Interp *interp, /* Interpreter to use for error reporting. */ @@ -833,6 +839,7 @@ TkCreateMainWindow( TkWindow *winPtr; const TkCmd *cmdPtr; ClientData clientData; + Tcl_CmdInfo info; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); @@ -953,6 +960,75 @@ TkCreateMainWindow( Tcl_HideCommand(interp, cmdPtr->name, cmdPtr->name); } } + if (Tcl_GetCommandInfo(interp, "::tcl::build-info", &info)) { + Tcl_CreateObjCommand(interp, "::tk::build-info", + info.objProc, + TK_PATCH_LEVEL "+" STRINGIFY(TK_VERSION_UUID) +#if defined(MAC_OSX_TK) + ".aqua" +#endif +#if defined(__clang__) && defined(__clang_major__) + ".clang-" STRINGIFY(__clang_major__) +#if __clang_minor__ < 10 + "0" +#endif + STRINGIFY(__clang_minor__) +#endif +#if defined(__cplusplus) && !defined(__OBJC__) + ".cplusplus" +#endif +#ifndef NDEBUG + ".debug" +#endif +#if !defined(__clang__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) + ".gcc-" STRINGIFY(__GNUC__) +#if __GNUC_MINOR__ < 10 + "0" +#endif + STRINGIFY(__GNUC_MINOR__) +#endif + ".glyph-indexing-2" +#ifdef __INTEL_COMPILER + ".icc-" STRINGIFY(__INTEL_COMPILER) +#endif +#ifdef TCL_MEM_DEBUG + ".memdebug" +#endif +#if defined(_MSC_VER) + ".msvc-" STRINGIFY(_MSC_VER) +#endif +#ifdef USE_NMAKE + ".nmake" +#endif +#ifndef TCL_CFG_OPTIMIZED + ".no-optimize" +#endif +#ifdef __OBJC__ + ".objective-c" +#if defined(__cplusplus) + "plusplus" +#endif +#endif +#ifdef TCL_CFG_PROFILED + ".profile" +#endif +#ifdef PURIFY + ".purify" +#endif +#ifdef STATIC_BUILD + ".static" +#endif +#if TCL_UTF_MAX <= (3 + (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 6)) + ".utf-16" +#endif +#if defined(_WIN32) + ".win32" +#endif +#if !defined(_WIN32) && !defined(MAC_OSX_TK) + ".x11" +#endif + , NULL); + } /* * Set variables for the interpreter. |