diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-09 11:33:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-09 11:33:46 (GMT) |
| commit | 08e8b8259e502b560e6170dbc1ab6b88bcebaf45 (patch) | |
| tree | e267cfa624f67163cd71dc130df384b372a50954 /generic | |
| parent | 8a77e2434be1ed1a76b7dc232aa388faa5f31c1c (diff) | |
| parent | cc51cd8b376484c83fa87e30582d1c53712387d5 (diff) | |
| download | tk-08e8b8259e502b560e6170dbc1ab6b88bcebaf45.zip tk-08e8b8259e502b560e6170dbc1ab6b88bcebaf45.tar.gz tk-08e8b8259e502b560e6170dbc1ab6b88bcebaf45.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFrame.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/generic/tkFrame.c b/generic/tkFrame.c index 1112f81..54ba8e8 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -806,7 +806,7 @@ FrameWidgetObjCmd( || ((c == 'v') && (strncmp(arg, "-visual", (unsigned)length) == 0))) { -#ifdef SUPPORT_CONFIG_EMBEDDED +#ifdef _WIN32 if (c == 'u') { const char *string = Tcl_GetString(objv[i+1]); diff --git a/generic/tkInt.h b/generic/tkInt.h index 006d999..a98b6d6 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -370,8 +370,6 @@ typedef struct TkDisplay { #define TkGetContainer(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr) -#define TkGetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ - ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr) /* * Information used by tkGet.c only: |