<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/99a69e509ed7c5eab314fc77e5a37d1ce19f6367">https://github.com/macports/macports-ports/commit/99a69e509ed7c5eab314fc77e5a37d1ce19f6367</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 99a69e509ed7c5eab314fc77e5a37d1ce19f6367
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun May 5 17:34:40 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> blt: update version 2.4z->2.5.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> For an explanation of this versioning scheme, see
</span><span style='display:block; white-space:pre;color:#404040;'> https://trac.macports.org/ticket/15095#comment:17.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/15095
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/40203
</span>---
x11/blt/Portfile | 103 +-
x11/blt/files/02-debian-all.patch | 99 ++
x11/blt/files/03-fedora-patch-2.patch | 43 +
x11/blt/files/04-fedora-tk8.5.6.patch | 823 ++++++++++++++++
x11/blt/files/05-tk8.5-zoomstack.patch | 38 +
x11/blt/files/autoreconf.patch | 43 +
x11/blt/files/blt-2.4z-darwin.patch | 36 +
x11/blt/files/blt-2.4z-tcl8.5-fix.patch | 37 -
x11/blt/files/blt-x86_64.patch | 25 -
x11/blt/files/blt2.4z-noexactversion.patch | 11 -
x11/blt/files/blthash.patch | 16 +
x11/blt/files/bltnsutil.patch | 24 +
x11/blt/files/const.patch | 890 +++++++++++++++++
x11/blt/files/decls.patch | 42 +
x11/blt/files/doc-typos.patch | 407 ++++++++
x11/blt/files/install.patch | 180 ++++
x11/blt/files/ldflags.patch | 54 +
x11/blt/files/patch-Makefile.in | 24 -
x11/blt/files/patch-ac_prog_cc.diff | 11 +
x11/blt/files/patch-configure | 13 -
x11/blt/files/patch-demos-Makefile.in | 11 -
x11/blt/files/patch-install_location.diff | 11 +
x11/blt/files/patch-library-Makefile.in | 20 -
x11/blt/files/patch-library-pkgIndex.tcl.in | 14 -
x11/blt/files/patch-man-Makefile.in | 11 -
x11/blt/files/patch-src-Makefile.in | 11 -
x11/blt/files/patch-src-shared-Makefile.in | 70 --
x11/blt/files/patch-tk-8.6 | 20 -
x11/blt/files/pkgindex.patch | 90 ++
x11/blt/files/pointertoint.patch | 498 ++++++++++
x11/blt/files/source.patch | 85 ++
x11/blt/files/table.patch | 123 +++
x11/blt/files/tcl8.6.patch | 91 ++
x11/blt/files/tk8.6.patch | 29 +
x11/blt/files/uninitialized.patch | 278 ++++++
x11/blt/files/unused.patch | 899 +++++++++++++++++
x11/blt/files/usetclint.patch | 26 +
x11/blt/files/usetkint.patch | 1409 +++++++++++++++++++++++++++
38 files changed, 6298 insertions(+), 317 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/Portfile b/x11/blt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index acf5d29..eb7b1f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,14 @@
</span> #-*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
PortGroup active_variants 1.1
name blt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4z
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.5.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories x11
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span>
description BLT is an extension to the Tk toolkit, adding new widgets, \
geometry managers, and miscellaneous commands.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,13 +17,14 @@ long_description ${description}
</span> homepage http://blt.sourceforge.net/
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname BLT${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir blt${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:wize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_zip yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname blt-src-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir blt[join [lrange [split ${version} .] 0 1] .]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d54d9fdb6c61391c191afab4701716d18a3d928b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6de705eccf2ec676b4071b74ec9e211c590477fadf6f05566cfd8ed6a03c60da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2200973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a0e0882e19003bbdb8a89d7c3d410bd32b12b685 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6ec778f58f60f17e241156d00e7e6ca79938ff40fd61df7d23cdedfe7ec49943 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2724036
</span>
depends_build port:tcl \
port:tk \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,54 +34,55 @@ require_active_variants tk x11
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags -O3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -fno-common -DUSE_INTERP_RESULT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --exec_prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --bindir=${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --includedir=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --libdir=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tcllibs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tklibs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tclincls=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tkincls=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tcl=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-library-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-shared-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-library-pkgIndex.tcl.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-demos-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blt-2.4z-tcl8.5-fix.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blt2.4z-noexactversion.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blt-x86_64.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tk-8.6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-man-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-tcl=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tk=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# prevent having to modify all of Debian patches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# taken from Debian (https://packages.debian.org/unstable/devel/blt-dev)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 02-debian-all.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 03-fedora-patch-2.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 04-fedora-tk8.5.6.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 05-tk8.5-zoomstack.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc-typos.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcl8.6.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tk8.6.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ usetclint.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ usetkint.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ldflags.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkgindex.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ decls.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bltnsutil.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blthash.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninitialized.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unused.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pointertoint.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoreconf.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# taken from Gentoo (https://packages.gentoo.org/packages/dev-tcltk/blt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append blt-2.4z-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# make sure AC_PROG_CC is called, otherwise configure fails
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ac_prog_cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not install files in ${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args-append scriptdir=${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir INSTALL_ROOT=${destroot}
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__DESTROOT__|${destroot}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/shared/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/demos/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/library/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/man/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|../src/bltwish|${prefix}/bin/bltwish|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|../src/bltwish|${prefix}/bin/bltwish|g" \
</span> {*}[glob ${worksrcpath}/demos/*.tcl] \
{*}[glob ${worksrcpath}/demos/scripts/*.tcl]
}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/lib "ln -sf libBLT.2.4.dylib libBLT.2.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/lib "ln -sf libBLT.2.4.dylib libBLT.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/lib "ln -sf libBLTlite.2.4.dylib libBLTlite.2.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}${prefix}/lib "ln -sf libBLTlite.2.4.dylib libBLTlite.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # prevent conflict with Tk and tcllib
foreach fl [glob -tails -directory ${destroot}${prefix}/share/man/mann *.n] {
move ${destroot}${prefix}/share/man/mann/${fl} ${destroot}${prefix}/share/man/mann/blt-${fl}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/02-debian-all.patch b/x11/blt/files/02-debian-all.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..73a7ecf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/02-debian-all.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,99 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Remaining unsplit changes from previous packager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Includes the rest of the changes that were applied to the source code by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ previous packager.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Paul E. Johnson (Debian Packaging) <pauljohn32@freefaculty.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,7 +349,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ old_flags="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="-g -lm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([whether DBL_EPSILON can be computed])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_TRY_RUN_WITH_OUTPUT(blt_cv_dbl_epsilon, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_TRY_RUN_WITH_OUTPUT([blt_cv_dbl_epsilon], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main () {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double e, u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,16 +114,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define REBUILD_MULTIPLIER 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define START_LOGSIZE 5 /* Initial hash table size is 32. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define MAX_LIST_VALUES 21 /* Convert to hash table when node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * value list gets bigger than this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * many values. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (SIZEOF_VOID_P == 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RANDOM_INDEX(i) HashOneWord(mask, downshift, i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BITSPERWORD 64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define START_LOGSIZE 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MAX_LIST_VALUES 40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define START_LOGSIZE 5 /* Initial hash table size is 32. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MAX_LIST_VALUES 21 /* Convert to hash table when node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * value list gets bigger than this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * many values. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The following macro takes a preliminary integer hash value and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * produces an index into a hash tables bucket list. The idea is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltText.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltText.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -881,6 +881,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Pixmap bitmap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int active;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!textPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ display = Tk_Display(tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ theta = FMOD(tsPtr->theta, (double)360.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (theta < 0.0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltNsUtil.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltNsUtil.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *name, Tcl_Namespace *nsPtr, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *name, Tcl_Namespace *nsPtr, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,15 +66,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TCL_MAJOR_VERSION >= 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN Tcl_Namespace *Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *name, ClientData clientData, Tcl_NamespaceDeleteProc *nsDelProc));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *name, ClientData clientData, Tcl_NamespaceDeleteProc *nsDelProc));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN void Tcl_DeleteNamespace _ANSI_ARGS_((Tcl_Namespace *nsPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN Tcl_Namespace *Tcl_FindNamespace _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *name, Tcl_Namespace *context, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *name, Tcl_Namespace *context, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN int Tcl_Export _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Namespace *nsPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *name, int resetFlag));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *name, int resetFlag));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN Tcl_Var Tcl_FindNamespaceVar _ANSI_ARGS_((Tcl_Interp *interp, char *name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Namespace *contextNsPtr, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/demos/scripts/page.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/demos/scripts/page.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/local/bin/tclsh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!/usr/bin/tclsh8.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set page "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rows 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/demos/scripts/xcolors.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/demos/scripts/xcolors.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #!../bltwish
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tk version of xcolors
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/03-fedora-patch-2.patch b/x11/blt/files/03-fedora-patch-2.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cc79cb5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/03-fedora-patch-2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Apply 3 changes based on revisions developed by the fedora linux team.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --> + 03-fedora-patch-2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + 04-fedora-tk8.5.6.patch.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + 05-tk8.5-zoomstack.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Those patches are required to solve segmentation faults that are observed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when blt is used with tcltk 8.5. We have a substantial amount of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ experience using this patched version of blt in the Swarm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Simulation System (www.swarm.org) and have observed no ill-effects.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Paul E. Johnson (Debian Packaging) <pauljohn32@freefaculty.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrElem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrElem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1664,6 +1664,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClosestSearch search;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, x, y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags = TCL_LEAVE_ERR_MSG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int found;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (graphPtr->flags & RESET_AXES) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ResetAxes(graphPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1708,12 +1709,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search.dist = (double)(search.halo + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i < argc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_ChainLink *linkPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( /* empty */ ; i < argc; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NameToElement(graphPtr, argv[i], &elemPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR; /* Can't find named element */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (elemPtr->hidden) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ found = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (linkPtr = Blt_ChainFirstLink(graphPtr->elements.displayList);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ linkPtr == NULL; linkPtr = Blt_ChainNextLink(linkPtr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (elemPtr == Blt_ChainGetValue(linkPtr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ found = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((!found) || (elemPtr->hidden)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp, "element \"", argv[i],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\" is hidden", (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR; /* Element isn't visible */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/04-fedora-tk8.5.6.patch b/x11/blt/files/04-fedora-tk8.5.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..537c1fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/04-fedora-tk8.5.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,823 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Apply 3 changes based on revisions developed by the fedora linux team.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + 03-fedora-patch-2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --> + 04-fedora-tk8.5.6.patch.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + 05-tk8.5-zoomstack.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Those patches are required to solve segmentation faults that are observed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when blt is used with tcltk 8.5. We have a substantial amount of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ experience using this patched version of blt in the Swarm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Simulation System (www.swarm.org) and have observed no ill-effects.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Paul E. Johnson (Debian Packaging) <pauljohn32@freefaculty.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeViewEdit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeViewEdit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1177,9 +1177,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rightPos = count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((rightPos < tbPtr->selFirst) || (leftPos > tbPtr->selLast)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* No part of the text fragment is selected. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef TK_DRAWCHARS_ANGLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_DrawChars(tbPtr->display, drawable, tbPtr->gc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tbPtr->font, fragPtr->text, fragPtr->count,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x + fragPtr->x, y + fragPtr->y, 0.);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DrawChars(tbPtr->display, drawable, tbPtr->gc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tbPtr->font, fragPtr->text, fragPtr->count,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x + fragPtr->x, y + fragPtr->y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1221,9 +1227,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ width, fontMetrics.linespace,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tbPtr->selBorderWidth, tbPtr->selRelief);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef TK_DRAWCHARS_ANGLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_DrawChars(Tk_Display(tbPtr->tkwin), drawable, tbPtr->gc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tbPtr->font, fragPtr->text, fragPtr->count,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fragPtr->x + x, fragPtr->y + y, 0.);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DrawChars(Tk_Display(tbPtr->tkwin), drawable, tbPtr->gc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tbPtr->font, fragPtr->text, fragPtr->count,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fragPtr->x + x, fragPtr->y + y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((tbPtr->flags & TEXTBOX_FOCUS) && (tbPtr->cursorOn)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int left, top, right, bottom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrPs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrPs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -418,7 +418,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)psPtr, argv[3], flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 3, (char *)psPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1124,7 +1124,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fileName = argv[3]; /* First argument is the file name. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv++, argc--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 3, (char *)psPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrPen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrPen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_FreeProc **freeProcPtr; /* Not used. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Pen *penPtr = *(Pen **)(widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( ! penPtr ) return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return penPtr->name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -510,7 +510,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, graphPtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ penPtr->configSpecs, (char *)penPtr, options[0], flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin, penPtr->configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, penPtr->configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nOpts, options, (char *)penPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrHairs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrHairs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -390,7 +390,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)chPtr, argv[3], 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 3, (char *)chPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGraph.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGraph.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -944,7 +944,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (InitPens(graphPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, tkwin, configSpecs, argc - 2, argv + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, tkwin, configSpecs, argc - 2, argv + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)graphPtr, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1094,7 +1094,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)graphPtr, argv[2], flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 2, (char *)graphPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltUnixDnd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltUnixDnd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1834,7 +1834,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long gcMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_MakeWindowExist(tokenPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, tokenPtr->tkwin, tokenConfigSpecs, argc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, tokenPtr->tkwin, tokenConfigSpecs, argc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv, (char *)tokenPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3777,7 +3777,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, dndPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)dndPtr, argv[3], flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, dndPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, dndPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 3, (char *)dndPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4440,7 +4440,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dndPtr->hashPtr = hPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dndPtr->dataPtr = dataPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_SetHashValue(hPtr, dndPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, dndPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, dndPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 3, (char *)dndPtr, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltCanvEps.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltCanvEps.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1147,7 +1147,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tkwin = Tk_CanvasTkwin(canvas);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, tkwin, configSpecs, argc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, tkwin, configSpecs, argc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv, (char *)epsPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1974,10 +1974,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "eps", /* name */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sizeof(EpsItem), /* itemSize */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CreateEps, /* createProc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (Tk_ItemCreateProc *)CreateEps, /* createProc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configSpecs, /* configSpecs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ConfigureEps, /* configureProc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EpsCoords, /* coordProc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (Tk_ItemConfigureProc *)ConfigureEps, /* configureProc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (Tk_ItemCoordProc *)EpsCoords, /* coordProc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DeleteEps, /* deleteProc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DisplayEps, /* displayProc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_OLD_CANVAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2005,6 +2005,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_CreateItemType(&epsItemType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Initialize custom canvas option routines. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tagsOption.parseProc = Tk_CanvasTagsParseProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tagsOption.printProc = Tk_CanvasTagsPrintProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tagsOption.parseProc = (Tk_OptionParseProc *)Tk_CanvasTagsParseProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tagsOption.printProc = (Tk_OptionPrintProc *)Tk_CanvasTagsPrintProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltScrollbar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltScrollbar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -913,7 +913,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC new;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Image image;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, scrollPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, scrollPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)scrollPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeViewStyle.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeViewStyle.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -560,6 +560,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*ARGSUSED*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Blt_TreeViewTextbox(TreeView *tvPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TreeViewEntry *entryPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TreeViewColumn *columnPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FreeIcon(clientData, display, widgRec, offset, oldPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltDragdrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltDragdrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1065,7 +1065,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Token *tokenPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tokenPtr = &(srcPtr->token);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, srcPtr->tkwin, tokenConfigSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, srcPtr->tkwin, tokenConfigSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)tokenPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1293,7 +1293,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Handle the bulk of the options...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, srcPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, srcPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)srcPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltAlloc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltAlloc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,14 +40,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Tcl_Alloc/Tcl_Free routines because they don't automatically cause
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * a panic when not enough memory is available. There are cases (such
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * as allocating a very large vector) where it's recoverable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Using private is dangerous.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Tcl changes mem functions for debug which will conflict then with BLT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * stick to public API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTERN Blt_MallocProc TclpAlloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTERN Blt_FreeProc TclpFree;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTERN Blt_ReallocProc TclpRealloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//EXTERN Blt_MallocProc TclpAlloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//EXTERN Blt_FreeProc TclpFree;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//EXTERN Blt_ReallocProc TclpRealloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//Blt_MallocProc *Blt_MallocProcPtr = TclpAlloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//Blt_FreeProc *Blt_FreeProcPtr = TclpFree;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//Blt_ReallocProc *Blt_ReallocProcPtr = TclpRealloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Blt_MallocProc *Blt_MallocProcPtr = (Blt_MallocProc *)Tcl_Alloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Blt_FreeProc *Blt_FreeProcPtr = (Blt_FreeProc *)Tcl_Free;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Blt_ReallocProc *Blt_ReallocProcPtr = (Blt_ReallocProc *)Tcl_Realloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Blt_MallocProc *Blt_MallocProcPtr = TclpAlloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Blt_FreeProc *Blt_FreeProcPtr = TclpFree;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Blt_ReallocProc *Blt_ReallocProcPtr = TclpRealloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_MallocProc *Blt_MallocProcPtr = malloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrLegd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrLegd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1406,7 +1406,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)legendPtr, argv[3], flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 3, (char *)legendPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltHierbox.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltHierbox.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3321,7 +3321,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *colorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hierBox = hboxPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(hboxPtr->interp, hboxPtr->tkwin, entryConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(hboxPtr->interp, hboxPtr->tkwin, entryConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)entryPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3935,7 +3935,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Uid nameId;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Pixmap bitmap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hierBox = hboxPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, hboxPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, hboxPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)hboxPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4443,7 +4443,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Drawable drawable; /* Pixmap or window to draw into. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Entry *entryPtr; /* Entry to be drawn. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x1, y1, x2, y2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x1, y1i, x2, y2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int x, y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4463,22 +4463,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y += (height - hboxPtr->button.height) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x1 = x2 = x + LEVELWIDTH(treePtr->level) +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LEVELWIDTH(treePtr->level + 1) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y1 = y + hboxPtr->button.height / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y2 = y1 + entryPtr->lineHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y1i = y + hboxPtr->button.height / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y2 = y1i + entryPtr->lineHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((treePtr == hboxPtr->rootPtr) && (hboxPtr->hideRoot)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y1 += entryPtr->height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y1i += entryPtr->height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Clip the line's Y-coordinates at the window border.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (y1 < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y1 = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (y1i < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y1i = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (y2 > Tk_Height(hboxPtr->tkwin)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y2 = Tk_Height(hboxPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((y1 < Tk_Height(hboxPtr->tkwin)) && (y2 > 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x1, y1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((y1i < Tk_Height(hboxPtr->tkwin)) && (y2 > 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x1, y1i,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x2, y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4788,17 +4788,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x, y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((isFocused) && (hboxPtr->focusEdit) && (editPtr->cursorOn)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x1, y1, x2, y2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x1, y1i, x2, y2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetCursorLocation(hboxPtr, treePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x1 = x + editPtr->x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x2 = x1 + 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y1 = y + editPtr->y - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y2 = y1 + editPtr->height - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y1i = y + editPtr->y - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y2 = y1i + editPtr->height - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XDrawLine(hboxPtr->display, drawable, entryPtr->labelGC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x1, y1, x1, y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x1, y1i, x1, y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XDrawLine(hboxPtr->display, drawable, entryPtr->labelGC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x1 - 2, y1, x2, y1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x1 - 2, y1i, x2, y1i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XDrawLine(hboxPtr->display, drawable, entryPtr->labelGC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x1 - 2, y2, x2, y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4859,7 +4859,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int entryHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int buttonY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x1, y1, x2, y2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x1, y1i, x2, y2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Entry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = treePtr->entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4875,7 +4875,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buttonY = y + entryPtr->buttonY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x1 = x + (width / 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y1 = y2 = buttonY + (buttonPtr->height / 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y1i = y2 = buttonY + (buttonPtr->height / 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x2 = x1 + (LEVELWIDTH(treePtr->level) + LEVELWIDTH(treePtr->level + 1)) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((treePtr->parentPtr != NULL) && (hboxPtr->lineWidth > 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4883,17 +4883,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * For every node except root, draw a horizontal line from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the vertical bar to the middle of the icon.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x1, y1, x2, y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x1, y1i, x2, y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((entryPtr->flags & ENTRY_OPEN) && (hboxPtr->lineWidth > 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Entry is open, draw vertical line.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y2 = y1 + entryPtr->lineHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y2 = y1i + entryPtr->lineHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (y2 > Tk_Height(hboxPtr->tkwin)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y2 = Tk_Height(hboxPtr->tkwin); /* Clip line at window border. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x2, y1, x2, y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XDrawLine(hboxPtr->display, drawable, hboxPtr->lineGC, x2, y1i, x2, y2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((entryPtr->flags & ENTRY_BUTTON) && (treePtr->parentPtr != NULL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5506,7 +5506,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, hboxPtr->tkwin, buttonConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)hboxPtr, argv[0], 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(hboxPtr->interp, hboxPtr->tkwin, buttonConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(hboxPtr->interp, hboxPtr->tkwin, buttonConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)hboxPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltBusy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltBusy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -418,7 +418,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Cursor oldCursor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oldCursor = busyPtr->cursor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, busyPtr->tkRef, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, busyPtr->tkRef, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)busyPtr, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1573,7 +1573,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Free(tempName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_SetClass(tkwin, className);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = Tk_ConfigureWidget(interp, tkwin, specsPtr, argc, argv, widgRec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Blt_ConfigureWidget(interp, tkwin, specsPtr, argc, argv, widgRec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isTemporary) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DestroyWindow(tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTed.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTed.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -826,7 +826,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC newGC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long gcMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(tedPtr->interp, tedPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(tedPtr->interp, tedPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)tedPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrAxis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrAxis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3448,7 +3448,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(graphPtr->interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)axisPtr, argv[0], flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(graphPtr->interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(graphPtr->interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)axisPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltHtext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltHtext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * of the virtual text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the htext widget is broken in tk8.5.6 as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Tk_ConfigureWidget no longer supports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * queries of changed options. Need to migrate to Tk_SetOptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * instead hack a wrapper Blt_ConfigureWidget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "bltInt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef NO_HTEXT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,7 +345,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_CONFIG_DONT_SET_DEFAULT, &heightOption},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_CUSTOM, "-linespacing", "lineSpacing", "LineSpacing",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEF_HTEXT_LINE_SPACING, Tk_Offset(HText, leader),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TK_CONFIG_DONT_SET_DEFAULT, &bltDistanceOption},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TK_CONFIG_DONT_SET_DEFAULT, &bltDistanceOption},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_CUSTOM, "-maxheight", "maxHeight", "MaxHeight",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEF_HTEXT_MAX_HEIGHT, Tk_Offset(HText, maxHeight),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_CONFIG_DONT_SET_DEFAULT, &bltDistanceOption},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2841,9 +2848,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_GetFontMetrics(htPtr->font, &fontMetrics);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((segPtr->textEnd < htPtr->selFirst) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (segPtr->textStart > htPtr->selLast)) { /* No selected text */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef TK_DRAWCHARS_ANLGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ htPtr->charArr + segPtr->textStart, textLength - 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x, y + linePtr->baseline, 0.);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htPtr->charArr + segPtr->textStart, textLength - 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x, y + linePtr->baseline);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2872,9 +2885,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_MeasureChars(htPtr->font, htPtr->charArr + segPtr->textStart,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nChars, 10000, DEF_TEXT_FLAGS, &lastX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastX += x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef TK_DRAWCHARS_ANGLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ htPtr->charArr + segPtr->textStart, nChars, x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y + linePtr->baseline, 0.);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htPtr->charArr + segPtr->textStart, nChars, x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y + linePtr->baseline);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curPos = selStart;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (selLength > 0) { /* The selection itself */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2890,16 +2909,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastX, y + linePtr->baseline - fontMetrics.ascent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ width, fontMetrics.linespace, htPtr->selBorderWidth,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_RELIEF_RAISED);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef TK_DRAWCHARS_ANGLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_DrawChars(htPtr->display, draw, htPtr->selectGC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ htPtr->font, htPtr->charArr + selStart, selLength,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastX, y + linePtr->baseline, 0.);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DrawChars(htPtr->display, draw, htPtr->selectGC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htPtr->font, htPtr->charArr + selStart, selLength,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastX, y + linePtr->baseline);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastX = nextX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curPos = selStart + selLength;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nChars = segPtr->textEnd - curPos;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nChars > 0) { /* Text following the selection */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef TK_DRAWCHARS_ANGLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ htPtr->charArr + curPos, nChars - 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastX, y + linePtr->baseline, 0.);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DrawChars(htPtr->display, draw, htPtr->drawGC, htPtr->font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htPtr->charArr + curPos, nChars - 1, lastX, y + linePtr->baseline);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3055,18 +3086,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XFillRectangle(display, pixmap, htPtr->fillGC, 0, 0, width, height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (! htPtr->lineArr) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (deltaY >= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* handle null lineArr */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (htPtr->arraySize > 0 && htPtr->nLines > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (deltaY >= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y += htPtr->lineArr[htPtr->first].offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lineNum = htPtr->first;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastY = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y += htPtr->lineArr[htPtr->last].offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lineNum = htPtr->last;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastY = height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ forceCopy = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ htPtr->last = htPtr->first - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- forceCopy = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Draw each line */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = htPtr->first; i <= htPtr->last; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3365,7 +3399,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The page is always draw at full width and the viewport will clip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((htPtr->first != oldFirst) || (htPtr->last != oldLast)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((htPtr->first != oldFirst) || (htPtr->last != oldLast)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || htPtr->flags & TEXT_DIRTY ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int first, last;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3383,23 +3418,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! htPtr->lineArr) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = first; i <= last; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (htPtr->arraySize > 0 && htPtr->nLines > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (i = first; i <= last; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ offset = htPtr->lineArr[i].offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (linkPtr = Blt_ChainFirstLink(htPtr->lineArr[i].chainPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- linkPtr != NULL; linkPtr = Blt_ChainNextLink(linkPtr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- winPtr = Blt_ChainGetValue(linkPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (winPtr->tkwin != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MoveEmbeddedWidget(winPtr, offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- winPtr->flags &= ~WIDGET_VISIBLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ linkPtr != NULL; linkPtr = Blt_ChainNextLink(linkPtr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ winPtr = Blt_ChainGetValue(linkPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (winPtr->tkwin != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MoveEmbeddedWidget(winPtr, offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ winPtr->flags &= ~WIDGET_VISIBLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DrawPage(htPtr, deltaY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SendBogusEvent(tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DrawPage(htPtr, deltaY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SendBogusEvent(tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Reset flags */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- htPtr->flags &= ~TEXT_DIRTY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Reset flags */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ htPtr->flags &= ~TEXT_DIRTY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Selection Procedures */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3919,7 +3957,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (winPtr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, htPtr->tkwin, widgetConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, htPtr->tkwin, widgetConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc - 3, argv + 3, (char *)winPtr, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4089,8 +4127,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, htPtr->tkwin, specsPtr, itemPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[2], 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, htPtr->tkwin, specsPtr, argc - 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv + 2, itemPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, htPtr->tkwin, specsPtr, argc - 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argv + 2, itemPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * in 8.5 cant tell if in option was modified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * supposed to convert to Tk_SetOptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (itemPtr == (char *)htPtr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4487,7 +4530,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef ITCL_NAMESPACES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Itk_SetWidgetCommand(htPtr->tkwin, htPtr->cmdToken);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((Tk_ConfigureWidget(interp, htPtr->tkwin, configSpecs, argc - 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((Blt_ConfigureWidget(interp, htPtr->tkwin, configSpecs, argc - 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 2, (char *)htPtr, 0) != TCL_OK) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (ConfigureText(interp, htPtr) != TCL_OK)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DestroyWindow(htPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltWinDraw.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltWinDraw.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1647,8 +1647,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (drawable == None) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef TK_DRAWCHARS_ANGLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_DrawChars(display, drawable, gc, (Tk_Font)gc->font, string, length,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x, y, 0.);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DrawChars(display, drawable, gc, (Tk_Font)gc->font, string, length,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x, y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrMarker.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrMarker.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4313,7 +4313,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Save the old marker. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oldName = markerPtr->name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ under = markerPtr->drawUnder;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ markerPtr->classPtr->configSpecs, nOpts, options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)markerPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltBitmap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltBitmap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -917,7 +917,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info.padLeft = info.padRight = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info.padTop = info.padBottom = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info.font = (Tk_Font)NULL; /* Initialized by Tk_ConfigureWidget */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, tkwin, composeConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, tkwin, composeConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc - 4, argv + 4, (char *)&info, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1027,7 +1027,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Initialize info and then process flags */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info.rotate = 0.0; /* No rotation by default */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info.scale = 1.0; /* No scaling by default */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, dataPtr->tkwin, defineConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, dataPtr->tkwin, defineConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc - 4, argv + 4, (char *)&info, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTabnotebook.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTabnotebook.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2766,7 +2766,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC newGC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastNotebookInstance = nbPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, nbPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, nbPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)nbPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3691,7 +3691,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Preserve(tabPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastNotebookInstance = nbPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = Tk_ConfigureWidget(interp, nbPtr->tkwin, tabConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Blt_ConfigureWidget(interp, nbPtr->tkwin, tabConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nOpts, options, (char *)tabPtr, TK_CONFIG_ARGV_ONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ConfigureTab(nbPtr, tabPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltContainer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltContainer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1193,7 +1193,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC newGC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, cntrPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, cntrPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)cntrPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTabset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTabset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3163,7 +3163,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *activeColor; /* Active foreground. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabSet = setPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, setPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, setPtr->tkwin, configSpecs, argc, argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)setPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4452,7 +4452,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabSet = setPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Preserve(tabPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = Tk_ConfigureWidget(interp, setPtr->tkwin, tabConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Blt_ConfigureWidget(interp, setPtr->tkwin, tabConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nOpts, options, (char *)tabPtr, TK_CONFIG_ARGV_ONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == TCL_OK || nOpts>=2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ConfigureTab(setPtr, tabPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrGrid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrGrid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,7 +368,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)gridPtr, argv[3], flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(graphPtr->interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(graphPtr->interp, graphPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc - 3, argv + 3, (char *)gridPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1721,7 +1721,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oldSelVar = (butPtr->selVarName?strdup(butPtr->selVarName):NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, butPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, butPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)butPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (oldTextVar) ckfree(oldTextVar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (oldTextVar) ckfree(oldSelVar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrElem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrElem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1699,7 +1699,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search.x = x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search.y = y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin, closestSpecs, i - 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, closestSpecs, i - 6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv + 6, (char *)&search, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR; /* Error occurred processing an option. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1854,7 +1854,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, graphPtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elemPtr->specsPtr, (char *)elemPtr, options[0], flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, graphPtr->tkwin, elemPtr->specsPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, elemPtr->specsPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ numOpts, options, (char *)elemPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1201,7 +1201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oldRowSpan = entryPtr->row.span;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oldColSpan = entryPtr->column.span;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, entryPtr->tkwin, entryConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, entryPtr->tkwin, entryConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)entryPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1553,7 +1553,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(tablePtr->interp, tablePtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infoPtr->configSpecs, (char *)rcPtr, argv[0], 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(tablePtr->interp, tablePtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(tablePtr->interp, tablePtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infoPtr->configSpecs, argc, argv, (char *)rcPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1578,7 +1578,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rcPtr = GetRowColumn(infoPtr, n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(rcPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(tablePtr->interp, tablePtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(tablePtr->interp, tablePtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infoPtr->configSpecs, argc, argv, (char *)rcPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1861,7 +1861,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, tablePtr->tkwin, tableConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)tablePtr, argv[0], 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Tk_ConfigureWidget(interp, tablePtr->tkwin, tableConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ConfigureWidget(interp, tablePtr->tkwin, tableConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)tablePtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2198,7 +2198,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argc > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = Tk_ConfigureWidget(tablePtr->interp, entryPtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Blt_ConfigureWidget(tablePtr->interp, entryPtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryConfigSpecs, argc, argv, (char *)entryPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_CONFIG_ARGV_ONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/05-tk8.5-zoomstack.patch b/x11/blt/files/05-tk8.5-zoomstack.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..268e154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/05-tk8.5-zoomstack.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Apply 3 changes based on revisions developed by the fedora linux team.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + 03-fedora-patch-2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + 04-fedora-tk8.5.6.patch.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --> + 05-tk8.5-zoomstack.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Those patches are required to solve segmentation faults that are observed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when blt is used with tcltk 8.5. We have a substantial amount of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ experience using this patched version of blt in the Swarm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Simulation System (www.swarm.org) and have observed no ill-effects.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Paul E. Johnson (Debian Packaging) <pauljohn32@freefaculty.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabnotebook.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabset.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ treeview.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ZoomStack.itcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tvutil.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tclIndex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/library/ZoomStack.itcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/library/ZoomStack.itcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import add itcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import add itcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++package require Itcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace import itcl::*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class ZoomStackGraph {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,6 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private method SaveCoords { x y }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private method Zoom {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private method Unzoom {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ private method Empty {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private method Push { cmd }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private method Pop {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private method MarkPoint { x y }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/autoreconf.patch b/x11/blt/files/autoreconf.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a3394c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/autoreconf.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: fix autotools input for compatibility with recent autoconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It is not possible to regenerate the blt configure script using current
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions of autoconf. Update for recent syntax so that we can get a modern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (and cross-build-friendly) configure script at build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Helmut Grohne <helmut@subdivi.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug-Debian: http://bugs.debian.org/772590
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ruN a/aclocal.m4 b/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > conftest.$ac_ext <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [#]line __oline__ "configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "confdefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_LANG_CASE([C++], [#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" void exit(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ruN a/configure.in b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,9 +127,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(CC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PROG_CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x${GCC}" != "x" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AS_IF([test "x${GCC}" != "x"],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blt_have_gcc="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([if C compiler is really gcc])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_EGREP_CPP(_cc_is_gcc_, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +137,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [blt_have_gcc=yes], [blt_have_gcc=no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([$blt_have_gcc])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CFLAGS search order
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/blt-2.4z-darwin.patch b/x11/blt/files/blt-2.4z-darwin.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..076304b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/blt-2.4z-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,9 +183,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blt_lib_prefix=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *-*-macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blt_platform="macosx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blt_platform="unix"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -728,6 +725,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-hpux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_SUFFIX="sl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_SUFFIX="dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_SUFFIX="so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1154,6 +1154,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_CFLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_LD="${CC}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_SUFFIX=".dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-dgux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_CFLAGS="-K PIC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_LD="cc"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/blt-2.4z-tcl8.5-fix.patch b/x11/blt/files/blt-2.4z-tcl8.5-fix.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f60e03d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/blt-2.4z-tcl8.5-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bltNsUtil.h.org 2007-05-10 04:38:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bltNsUtil.h 2007-05-10 04:41:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,10 +46,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TCL_NAMESPACE_ONLY TCL_GLOBAL_ONLY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *name, Tcl_Namespace *nsPtr, int flags));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NS_SEARCH_NONE (0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NS_SEARCH_CURRENT (1<<0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NS_SEARCH_GLOBAL (1<<1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,17 +64,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN Tcl_Namespace *Tcl_GetGlobalNamespace _ANSI_ARGS_((Tcl_Interp *interp));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (TCL_MAJOR_VERSION >= 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN Tcl_Namespace *Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *name, ClientData clientData, Tcl_NamespaceDeleteProc *nsDelProc));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN void Tcl_DeleteNamespace _ANSI_ARGS_((Tcl_Namespace *nsPtr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN Tcl_Namespace *Tcl_FindNamespace _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *name, Tcl_Namespace *context, int flags));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN int Tcl_Export _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Namespace *nsPtr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *name, int resetFlag));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN Tcl_Var Tcl_FindNamespaceVar _ANSI_ARGS_((Tcl_Interp *interp, char *name,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Namespace *contextNsPtr, int flags));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/blt-x86_64.patch b/x11/blt/files/blt-x86_64.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 699879e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/blt-x86_64.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bltTree.c.orig 2002-09-29 07:44:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bltTree.c 2004-11-05 12:27:45.797366712 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,17 +95,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define REBUILD_MULTIPLIER 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define START_LOGSIZE 5 /* Initial hash table size is 32. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define MAX_LIST_VALUES 20 /* Convert to hash table when node
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * value list gets bigger than this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * many values. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (SIZEOF_VOID_P == 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RANDOM_INDEX(i) HashOneWord(mask, downshift, i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define BITSPERWORD 64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define START_LOGSIZE 5 /* Initial hash table size is 32. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define MAX_LIST_VALUES 20 /* Convert to hash table when node
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * value list gets bigger than this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * many values. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * The following macro takes a preliminary integer hash value and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * produces an index into a hash tables bucket list. The idea is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/blt2.4z-noexactversion.patch b/x11/blt/files/blt2.4z-noexactversion.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9eb4be2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/blt2.4z-noexactversion.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bltInit.c.orig 2002-09-10 07:12:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bltInit.c 2012-05-05 12:52:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <bltInt.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define EXACT 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define EXACT 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef BLT_LIBRARY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WIN32
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/blthash.patch b/x11/blt/files/blthash.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..df4c97f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/blthash.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch silences GCC warnings for overflow on implicit constant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conversions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: FreeBSD BLT maintainers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Tue, 08 Jul 2014 12:19:13 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltHash.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltHash.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,7 +88,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Acceptable key types for hash tables:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BLT_STRING_KEYS 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define BLT_ONE_WORD_KEYS ((size_t)-1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define BLT_ONE_WORD_KEYS -1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Forward declaration of Blt_HashTable. Needed by some C++ compilers
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/bltnsutil.patch b/x11/blt/files/bltnsutil.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1b911a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/bltnsutil.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch fixes call to Blt_ParseQualifiedName().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: FreeBSD BLT maintainers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Tue, 08 Jul 2014 11:51:01 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltNsUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltNsUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Var varPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Namespace *nsPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *objPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *str, *cp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *str, *cp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ varPtr = Tcl_FindNamespaceVar(interp, (char *)name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Tcl_Namespace *)NULL, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objPtr = Tcl_NewObj();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_GetVariableFullName(interp, varPtr, objPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str = Tcl_GetString(objPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Blt_ParseQualifiedName(interp, str, &nsPtr, &cp) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Blt_ParseQualifiedName(interp, str, &nsPtr, &cp) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nsPtr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DecrRefCount(objPtr);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/const.patch b/x11/blt/files/const.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a82519a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/const.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,890 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Descriptiom: Patch makes explicit casts to silence GCC warnings about
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incompatible pointer types (mostly adds or removes const modifier).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Wed, 09 Jul 2014 19:22:39 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltArrayObj.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltArrayObj.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_HashEntry *hPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_HashTable *tablePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *elemObjPtr, **vobjv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_ObjType *oldTypePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST Tcl_ObjType *oldTypePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isNew;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nElem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltBgexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltBgexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -926,7 +926,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DStringInit(&dStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetSinkData(sinkPtr, &data, &length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DStringAppend(&dStr, sinkPtr->command, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_DStringAppendElement(&dStr, data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_DStringAppendElement(&dStr, (char *)data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DStringAppendElement(&dStr, status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GlobalEval(interp, Tcl_DStringValue(&dStr)) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_BackgroundError(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dictType == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj * obj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ obj = Tcl_NewDictObj();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dictType = obj->typePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dictType = (Tcl_ObjType *)obj->typePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DecrRefCount(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (objPtr->typePtr == dictType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3320,7 +3320,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tPtr->nodeTable.numEntries > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags |= TREE_TRACE_TAGMULTIPLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = CallTraces(interp, clientPtr, node->treeObject, node, tagName,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = CallTraces(interp, clientPtr, node->treeObject, node, (Blt_TreeKey)tagName,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags, &cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == TCL_BREAK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3349,7 +3349,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(node->flags & TREE_TRACE_ACTIVE)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return CallTraces(interp, clientPtr, node->treeObject, node, tagName,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return CallTraces(interp, clientPtr, node->treeObject, node, (Blt_TreeKey)tagName,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (TREE_TRACE_TAGDELETE), &cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7733,7 +7733,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (valueObjPtr->typePtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetResult(interp, valueObjPtr->typePtr->name, TCL_VOLATILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetResult(interp, (char *)(valueObjPtr->typePtr->name), TCL_VOLATILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetResult(interp, "string", TCL_STATIC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltVector.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltVector.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -370,7 +370,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *indexPtr = (int)value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cleanup:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (string != zStatic) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_Free( string );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_Free( (void *)string );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrAxis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrAxis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3436,7 +3436,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Axis *axisPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *argv[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *argv[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrElem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrElem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1658,7 +1658,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr; /* Graph widget */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Interpreter to report results to */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of element names */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* List of element names */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* List of element names */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Element *elemPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClosestSearch search;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1821,12 +1821,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *argv[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *argv[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Element *elemPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int numNames, numOpts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Figure out where the option value pairs begin */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrGrid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrGrid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -355,7 +355,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Grid *gridPtr = (Grid *)graphPtr->gridPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrHairs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrHairs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -379,7 +379,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Crosshairs *chPtr = graphPtr->crosshairs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrLegd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrLegd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1393,7 +1393,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags = TK_CONFIG_ARGV_ONLY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Legend *legendPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrMarker.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrMarker.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4274,13 +4274,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Marker *markerPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags = TK_CONFIG_ARGV_ONLY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *oldName;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nNames, nOpts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int under;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrPen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrPen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,13 +475,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *argv[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *argv[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Pen *penPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nNames, nOpts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int redraw;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Figure out where the option value pairs begin */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrPs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrPs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -406,7 +406,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of options in argv vector */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Option vector */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Option vector */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags = TK_CONFIG_ARGV_ONLY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PostScript *psPtr = (PostScript *)graphPtr->postscript;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1110,7 +1110,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr; /* Graph widget record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of options in argv vector */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Option vector */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Option vector */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PostScript *psPtr = (PostScript *)graphPtr->postscript;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *f = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1121,7 +1121,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fileName = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argc > 3) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argv[3][0] != '-') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fileName = argv[3]; /* First argument is the file name. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileName = (char *)argv[3]; /* First argument is the file name. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv++, argc--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Blt_ConfigureWidget(interp, graphPtr->tkwin, configSpecs, argc - 3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGraph.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGraph.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -887,7 +887,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CreateGraph(interp, argc, argv, classUid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Uid classUid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1082,7 +1082,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Graph *graphPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltBitmap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltBitmap.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -887,7 +887,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Thread-specific data for bitmaps. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Interpreter to report results to */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of arguments */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Argument list */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Argument list */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BitmapInterpData *dataPtr = clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, height; /* Dimensions of bitmap */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -934,7 +934,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ts.leader = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ts.anchor = TK_ANCHOR_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- textPtr = Blt_GetTextLayout(argv[3], &ts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ textPtr = Blt_GetTextLayout((char *)argv[3], &ts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitmap = Blt_CreateTextBitmap(tkwin, textPtr, &ts, &width, &height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Free(textPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bitmap == None) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1003,7 +1003,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Thread-specific data for bitmaps. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Interpreter to report results to */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of arguments */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Argument list */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Argument list */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BitmapInterpData *dataPtr = clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, height; /* Dimensions of bitmap */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1032,7 +1032,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Skip leading spaces. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (p = argv[3]; isspace(UCHAR(*p)); p++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (p = (char *)argv[3]; isspace(UCHAR(*p)); p++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*empty*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defn = Blt_Strdup(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltBusy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltBusy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -413,7 +413,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Busy *busyPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Cursor oldCursor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltCanvEps.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltCanvEps.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1136,7 +1136,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Canvas canvas; /* Canvas containing itemPtr. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Item *itemPtr; /* EPS item to reconfigure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of elements in argv. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Arguments describing things to configure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Arguments describing things to configure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags; /* Flags to pass to Tk_ConfigureWidget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EpsItem *epsPtr = (EpsItem *)itemPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1282,10 +1282,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long gcMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC newGC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, height, i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tkwin = Tk_CanvasTkwin(canvas);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = (char**)ckalloc((argc+1)*sizeof(char*));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argv = (CONST char **)ckalloc((argc+1)*sizeof(char*));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i=0; i<argc; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[i] = Tcl_GetString(objv[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1545,7 +1545,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *tempName;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *oldClass;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char *oldClass;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isTemporary = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tempName = Blt_Strdup(resName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1573,7 +1573,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Free(tempName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_SetClass(tkwin, className);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = Blt_ConfigureWidget(interp, tkwin, specsPtr, argc, argv, widgRec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Blt_ConfigureWidget(interp, tkwin, specsPtr, argc, (CONST char **)argv, widgRec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isTemporary) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DestroyWindow(tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltOldConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltOldConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -578,7 +578,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case TK_CONFIG_CUSTOM:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((*specPtr->customPtr->parseProc)(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ specPtr->customPtr->clientData, interp, tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- value, widgRec, specPtr->offset) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (char *)value, widgRec, specPtr->offset) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -737,7 +737,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[2] = specPtr->dbClass;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[3] = specPtr->defValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (specPtr->type == TK_CONFIG_SYNONYM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return Tcl_Merge(2, argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return Tcl_Merge(2, (char * CONST *)argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[4] = FormatConfigValue(interp, tkwin, specPtr, widgRec, buffer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &freeProc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -768,10 +768,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[5] = conftypes[specPtr->type];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = Tcl_Merge(6, argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Tcl_Merge(6, (char * CONST *)argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = Tcl_Merge(5, argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Tcl_Merge(5, (char * CONST *)argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (freeProc != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((freeProc == TCL_DYNAMIC) || (freeProc == (Tcl_FreeProc *) free)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltContainer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltContainer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1185,7 +1185,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * may not already have values for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * some fields. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XGCValues gcValues;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltDragdrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltDragdrop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -452,9 +452,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void SourceEventProc _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XEvent *eventPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ConfigureSource _ANSI_ARGS_((Tcl_Interp *interp, Source * srcPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int argc, char **argv, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int argc, CONST char **argv, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ConfigureToken _ANSI_ARGS_((Tcl_Interp *interp, Source * srcPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int argc, char **argv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int argc, CONST char **argv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Target *CreateTarget _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Target *FindTarget _ANSI_ARGS_((Tk_Window tkwin));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1060,7 +1060,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Source *srcPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Token *tokenPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1069,7 +1069,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)tokenPtr, TK_CONFIG_ARGV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ConfigureSource(interp, srcPtr, 0, (char **)NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ConfigureSource(interp, srcPtr, 0, (CONST char **)NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_CONFIG_ARGV_ONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1161,7 +1161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcPtr->token.borderWidth = srcPtr->token.activeBorderWidth = 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcPtr->hashPtr = hPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_InitHashTable(&(srcPtr->handlerTable), BLT_STRING_KEYS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ConfigureSource(interp, srcPtr, 0, (char **)NULL, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ConfigureSource(interp, srcPtr, 0, (CONST char **)NULL, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DestroySource(srcPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1280,7 +1280,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* current interpreter */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Source *srcPtr; /* drag&drop source widget record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* number of arguments */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* argument strings */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* argument strings */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags; /* flags controlling interpretation */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long gcMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2332,11 +2332,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TokenOp(interp, argc, argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Source *srcPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (GetSource(interp, argv[2], &srcPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (GetSource(interp, (char *)argv[2], &srcPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((argc > 3) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2408,7 +2408,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SourceOp(interp, argc, argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Source *srcPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isNew;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2429,7 +2429,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Find or create source info...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- srcPtr = CreateSource(interp, argv[2], &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ srcPtr = CreateSource(interp, (char *)argv[2], &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (srcPtr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltHierbox.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltHierbox.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1088,7 +1088,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void EventuallyInvokeSelectCmd _ANSI_ARGS_((Hierbox *hboxPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ComputeVisibleEntries _ANSI_ARGS_((Hierbox *hboxPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ConfigureEntry _ANSI_ARGS_((Hierbox *hboxPtr, Entry * entryPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int argc, char **argv, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int argc, CONST char **argv, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void ComputeLayout _ANSI_ARGS_((Hierbox *hboxPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static CompareProc ExactCompare, GlobCompare, RegexpCompare;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2064,7 +2064,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr->labelText = Blt_Strdup(name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ConfigureEntry(hboxPtr, entryPtr, 0, (char **)NULL, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ConfigureEntry(hboxPtr, entryPtr, 0, (CONST char **)NULL, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DestroyEntry(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3309,7 +3309,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Hierbox *hboxPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Entry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC newGC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3926,7 +3926,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Hierbox *hboxPtr; /* Information about widget; may or may not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * already have values for some fields. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XGCValues gcValues;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5493,7 +5493,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Hierbox *hboxPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Figure out where the option value pairs begin */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc -= 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5829,7 +5829,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nIds, nOpts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tree *treePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5847,7 +5847,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nIds = i; /* Number of element names specified */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nOpts = argc - i; /* Number of options specified */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options = argv + i; /* Start of options in argv */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ options = (CONST char **)argv + i; /* Start of options in argv */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < nIds; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StringToNode(hboxPtr, argv[i], &treePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7204,7 +7204,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DString dString;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i, l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nOpts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **nameArr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rootPtr = hboxPtr->rootPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7230,7 +7230,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nOpts = argc - count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options = argv + count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ options = (CONST char **)argv + count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DStringInit(&dString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < count; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltHtext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltHtext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3948,7 +3948,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HText *htPtr; /* Hypertext widget */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Interpreter associated with widget */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Line *linePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EmbeddedWidget *winPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4092,7 +4092,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HText *htPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *itemPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_ConfigSpec *specsPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4531,7 +4531,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Itk_SetWidgetCommand(htPtr->tkwin, htPtr->cmdToken);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((Blt_ConfigureWidget(interp, htPtr->tkwin, configSpecs, argc - 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv + 2, (char *)htPtr, 0) != TCL_OK) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (CONST char **)argv + 2, (char *)htPtr, 0) != TCL_OK) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (ConfigureText(interp, htPtr) != TCL_OK)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DestroyWindow(htPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1181,7 +1181,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Entry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Option-value arguments */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int oldRowSpan, oldColSpan;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1533,7 +1533,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PartitionInfo *infoPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *pattern;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RowColumn *rcPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Blt_ChainLink *linkPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1852,7 +1852,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Table *tablePtr; /* Table to be configured */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Interpreter to report results back to */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Option-value pairs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Option-value pairs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argc == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tk_ConfigureInfo(interp, tablePtr->tkwin, tableConfigSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2179,7 +2179,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int row, column;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Entry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int result = TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTabnotebook.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTabnotebook.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2758,7 +2758,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * may not already have values for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * some fields. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XGCValues gcValues;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3155,7 +3155,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Notebook *nbPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Not used. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tab *tabPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ChainLink *linkPtr, *beforeLinkPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3193,7 +3193,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lastNotebookInstance = nbPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Blt_ConfigureWidgetComponent(interp, nbPtr->tkwin, tabPtr->name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Tab", tabConfigSpecs, argc - 3, argv + 3, (char *)tabPtr, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Tab", tabConfigSpecs, argc - 3, (char **)argv + 3, (char *)tabPtr, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DestroyTab(nbPtr, tabPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3658,10 +3658,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Notebook *nbPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nTabs, nOpts, result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tab *tabPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTabset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTabset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3154,7 +3154,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * may not already have values for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * some fields. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XGCValues gcValues;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3404,7 +3404,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tabset *setPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabSet = setPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argc == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3665,7 +3665,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tab *beforePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (GetTabByIndName(setPtr, argv[2], &beforePtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (GetTabByIndName(setPtr, (char *)argv[2], &beforePtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto finish;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4415,10 +4415,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tabset *setPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nTabs, nOpts, result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tab *tabPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6844,7 +6844,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setPtr = CreateTabset(interp, tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ConfigureTabset(interp, setPtr, argc - 2, argv + 2, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ConfigureTabset(interp, setPtr, argc - 2, (CONST char **)argv + 2, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DestroyWindow(setPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeViewCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeViewCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5186,8 +5186,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string, *subPath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nLen, idx, useid, oLen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sobjc, tobjc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_Obj *CONST *sobjv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_Obj *CONST *tobjv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_Obj **sobjv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_Obj **tobjv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewStyle *stylePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewColumn *columnPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewEntry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltUnixDnd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltUnixDnd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -620,7 +620,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DestroyDnd _ANSI_ARGS_((DestroyData data));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int DndEventProc _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ConfigureToken _ANSI_ARGS_((Tcl_Interp *interp, Dnd *dndPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int argc, char **argv, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int argc, CONST char **argv, int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Winfo *OverTarget _ANSI_ARGS_((Dnd *dndPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void AddTargetProperty _ANSI_ARGS_((Dnd *dndPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1825,7 +1825,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* current interpreter */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dnd *dndPtr; /* Drag&drop source widget record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* number of arguments */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* argument strings */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* argument strings */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags; /* flags controlling interpretation */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC newGC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3761,12 +3761,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Thread-specific data. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* current interpreter */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* number of arguments */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* argument strings */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* argument strings */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dnd *dndPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (GetDnd(clientData, interp, argv[2], &dndPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (GetDnd(clientData, interp, (char *)argv[2], &dndPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = TK_CONFIG_ARGV_ONLY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4418,7 +4418,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DndInterpData *dataPtr = clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4462,12 +4462,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Thread-specific data. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dnd *dndPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (GetDnd(clientData, interp, argv[3], &dndPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (GetDnd(clientData, interp, (char *)argv[3], &dndPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4529,13 +4529,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Thread-specific data. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Token *tokenPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dnd *dndPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (GetDnd(clientData, interp, argv[3], &dndPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (GetDnd(clientData, interp, (char *)argv[3], &dndPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = TK_CONFIG_ARGV_ONLY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -855,7 +855,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp, int argc, char **argv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void ComputeButtonGeometry _ANSI_ARGS_((Button *butPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ConfigureButton _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Button *butPtr, int argc, char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Button *butPtr, int argc, CONST char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DestroyButton _ANSI_ARGS_((Button *butPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DisplayButton _ANSI_ARGS_((ClientData clientData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1305,7 +1305,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_CreateEventHandler(butPtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ExposureMask | StructureNotifyMask | FocusChangeMask,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ButtonEventProc, butPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ConfigureButton(interp, butPtr, argc - 2, argv + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ConfigureButton(interp, butPtr, argc - 2, (CONST char **)argv + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configFlags[type]) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_DestroyWindow(butPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1337,7 +1337,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value = Tcl_GetString(valuePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (char *)value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ButtonSetValue(Button *butPtr, char *value, int warn) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1427,7 +1427,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)butPtr, argv[2],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configFlags[butPtr->type]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = ConfigureButton(interp, butPtr, argc - 2, argv + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = ConfigureButton(interp, butPtr, argc - 2, (CONST char **)argv + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configFlags[butPtr->type] | TK_CONFIG_ARGV_ONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if ((c == 'd') && (strncmp(argv[1], "deselect", length) == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1694,7 +1694,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Button *butPtr; /* Information about widget; may or may
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * not already have values for some fields. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of valid entries in argv. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags; /* Flags to pass to Tk_ConfigureWidget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XGCValues gcValues;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/tkFrame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/tkFrame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -734,7 +734,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* TK_MAJOR_VERSION > 4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tk_ConfigureWidget(interp, framePtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argc, argv, (char *)framePtr, flags | framePtr->mask) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argc, (CONST char **)argv, (char *)framePtr, flags | framePtr->mask) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (framePtr->tile != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltScrollbar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltScrollbar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,7 +301,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void ComputeScrollbarGeometry _ANSI_ARGS_((
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Scrollbar *scrollPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ConfigureScrollbar _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Scrollbar *scrollPtr, int argc, char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Scrollbar *scrollPtr, int argc, CONST char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DestroyScrollbar _ANSI_ARGS_((DestroyData *memPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DisplayScrollbar _ANSI_ARGS_((ClientData clientData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -434,7 +434,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_CreateEventHandler(scrollPtr->tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ExposureMask | StructureNotifyMask | FocusChangeMask,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ScrollbarEventProc, (ClientData)scrollPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ConfigureScrollbar(interp, scrollPtr, argc - 2, argv + 2, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ConfigureScrollbar(interp, scrollPtr, argc - 2, (CONST char **)argv + 2, 0) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetResult(interp, Tk_PathName(scrollPtr->tkwin), TCL_VOLATILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -558,7 +558,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = Tk_ConfigureInfo(interp, scrollPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)scrollPtr, argv[2], 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = ConfigureScrollbar(interp, scrollPtr, argc - 2, argv + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = ConfigureScrollbar(interp, scrollPtr, argc - 2, (CONST char **)argv + 2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_CONFIG_ARGV_ONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if ((c == 'd') && (strncmp(argv[1], "delta", length) == 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -904,7 +904,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * may not already have values for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * some fields. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of valid entries in argv. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags; /* Flags to pass to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Tk_ConfigureWidget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTed.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTed.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -819,7 +819,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConfigureTed(tedPtr, argc, argv, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ted *tedPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Option-value pairs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST char **argv; /* Option-value pairs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XGCValues gcValues;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/decls.patch b/x11/blt/files/decls.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..52d4acf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/decls.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch fixes BLT stubs declarations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: FreeBSD BLT port maintainers, modified by Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Tue, 08 Jul 2014 11:28:55 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltDecls.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltDecls.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -532,7 +532,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeKey (*blt_TreeGetKey) _ANSI_ARGS_((CONST char * string)); /* 0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode (*blt_TreeCreateNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode parent, CONST char * name, int position)); /* 1 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_TreeNode (*blt_TreeCreateNodeWithId) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode parent, CONST char * name, int position, int inode)); /* 2 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_TreeNode (*blt_TreeCreateNodeWithId) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode parent, CONST char * name, unsigned int inode, int position)); /* 2 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeDeleteNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node)); /* 3 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeMoveNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, Blt_TreeNode parent, Blt_TreeNode before)); /* 4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode (*blt_TreeGetNode) _ANSI_ARGS_((Blt_Tree tree, unsigned int inode)); /* 5 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -558,7 +558,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeSetArrayValue) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, CONST char * elemName, Tcl_Obj * valueObjPtr)); /* 25 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeUnsetArrayValue) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, CONST char * elemName)); /* 26 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeArrayValueExists) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, CONST char * elemName)); /* 27 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int (*blt_TreeArrayNames) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, Tcl_Obj * listObjPtr)); /* 28 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int (*blt_TreeArrayNames) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, CONST char * arrayName, Tcl_Obj * listObjPtr, CONST char * pattern)); /* 28 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeGetValueByKey) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, Blt_TreeKey key, Tcl_Obj ** valuePtr)); /* 29 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeSetValueByKey) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, Blt_TreeKey key, Tcl_Obj * valuePtr)); /* 30 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeUnsetValueByKey) _ANSI_ARGS_((Tcl_Interp * interp, Blt_Tree tree, Blt_TreeNode node, Blt_TreeKey key)); /* 31 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -578,13 +578,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void (*blt_TreeDeleteTrace) _ANSI_ARGS_((Blt_TreeTrace token)); /* 45 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void (*blt_TreeCreateEventHandler) _ANSI_ARGS_((Blt_Tree tree, unsigned int mask, Blt_TreeNotifyEventProc * proc, ClientData clientData)); /* 46 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void (*blt_TreeDeleteEventHandler) _ANSI_ARGS_((Blt_Tree tree, unsigned int mask, Blt_TreeNotifyEventProc * proc, ClientData clientData)); /* 47 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void (*blt_TreeRelabelNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * string)); /* 48 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void (*blt_TreeRelabelNode2) _ANSI_ARGS_((Blt_TreeNode node, CONST char * string)); /* 49 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int (*blt_TreeRelabelNode) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * string)); /* 48 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int (*blt_TreeRelabelNode2) _ANSI_ARGS_((Blt_TreeNode node, CONST char * string)); /* 49 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char * (*blt_TreeNodePath) _ANSI_ARGS_((Blt_TreeNode node, Tcl_DString * resultPtr)); /* 50 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeNodePosition) _ANSI_ARGS_((Blt_TreeNode node)); /* 51 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void (*blt_TreeClearTags) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node)); /* 52 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void (*blt_TreeAddTag) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * tagName)); /* 53 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void (*blt_TreeForgetTag) _ANSI_ARGS_((Blt_Tree tree, CONST char * tagName)); /* 54 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int (*blt_TreeAddTag) _ANSI_ARGS_((Blt_Tree tree, Blt_TreeNode node, CONST char * tagName)); /* 53 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int (*blt_TreeForgetTag) _ANSI_ARGS_((Blt_Tree tree, CONST char * tagName)); /* 54 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeTagTableIsShared) _ANSI_ARGS_((Blt_Tree tree)); /* 55 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*blt_TreeShareTagTable) _ANSI_ARGS_((Blt_Tree src, Blt_Tree target)); /* 56 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_HashEntry * (*blt_TreeFirstTag) _ANSI_ARGS_((Blt_Tree tree, Blt_HashSearch * searchPtr)); /* 57 */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/doc-typos.patch b/x11/blt/files/doc-typos.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2f23331
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/doc-typos.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,407 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Documentation fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Corrections in spelling in the blt documentation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Paul E. Johnson (Debian Packaging) <pauljohn32@freefaculty.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/barchart.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/barchart.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1954,7 +1954,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-fill \fIcolor\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Sets the background color of the line. This color is used with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-striped lines (see the \fB\-fdashes\R option). If \fIcolor\fR is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++striped lines (see the \fB\-fdashes\fR option). If \fIcolor\fR is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the empty string, no background color is drawn (the line will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dashed, not striped). The default background color is \fB""\fR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/tree.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/tree.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -393,7 +393,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Reverse the direction of the copy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-tags\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Copy tag inforation. Normally the following node is copied: its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Copy tag information. Normally the following node is copied: its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label and data fields. This indicates to copy tags as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .RE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1804,7 +1804,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set nams {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vals {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach nam $s(*) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lappend vals \$s($nam)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lappend vals $s($nam)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend nams $nam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vals [join $vals ,]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/bitmap.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/bitmap.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,9 +82,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk will recognize "gray1" as a bitmap which can now be used with any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ widget that accepts bitmaps.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .CS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.barchart element configure elem1 -stipple gray1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\&.barchart element configure elem1 -stipple gray1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .CE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-The bitmap data can be specified in a mulitude of forms.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++The bitmap data can be specified in a multitude of forms.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The following commands are all equivalent.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .CS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitmap define gray1 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/eps.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/eps.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .DE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The \fBeps\fR item creates a new canvas item. \fICanvas\fR is the name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of a \fBcanvas\fR widget. You must supply the X-Y coordinate of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-the new eps item. How the coordinate is exactly interpretered is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++the new eps item. How the coordinate is exactly interpreted is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ controlled by the \fB\-anchor\fR option (see below).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Additional options may be specified on the command line to configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/tabset.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/tabset.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,7 +86,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabs and the sizes of the Tk widgets embedded inside each folder.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The widest widget determines the width of the folder. The tallest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ determines the height. If no folders contain an embedded widget, the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size is detemined solely by the size of the tabs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++size is determined solely by the size of the tabs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You can override either dimension with the tabset's \fB\-width\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and \fB\-height\fR options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -767,7 +767,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fBcenter\fR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-background \fIcolor\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Sets the background color for \fInameOrIndex\fR. Setting this option overides the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Sets the background color for \fInameOrIndex\fR. Setting this option overrides the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ widget's \fB\-tabbackground\fR option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-bindtags \fItagList\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/hiertable.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/hiertable.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1395,7 +1395,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The default is \fBsingle\fR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-separator \fIstring\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Specifies the character sequence to use when spliting the path components.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Specifies the character sequence to use when splitting the path components.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The separator may be several characters wide (such as "::")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Consecutive separators in a pathname are treated as one.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If \fIstring\fR is the empty string, the pathnames are Tcl lists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/treeview.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/treeview.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2037,7 +2037,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Set a tile background image to use for selection.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-separator \fIstring\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Specifies the character sequence to use when spliting the path components.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Specifies the character sequence to use when splitting the path components.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The separator may be several characters wide (such as "::")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Consecutive separators in a pathname are treated as one.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If \fIstring\fR is the empty string, the pathnames are Tcl lists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/hierbox.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/hierbox.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1395,7 +1395,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The default is \fBsingle\fR.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \fB\-separator \fIstring\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Specifies the character sequence to use when spliting the path components.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Specifies the character sequence to use when splitting the path components.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The separator may be several characters wide (such as "::")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Consecutive separators in a pathname are treated as one.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If \fIstring\fR is the empty string, the pathnames are Tcl lists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/container.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/container.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,7 +187,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabs and the sizes of the Tk widgets embedded inside each folder.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The widest widget determines the width of the folder. The tallest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ determines the height. If no folders contain an embedded widget, the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size is detemined solely by the size of the tabs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++size is determined solely by the size of the tabs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You can override either dimension with the container's \fB\-width\fR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and \fB\-height\fR options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/eps.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/eps.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,10 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create eps <I>x y </I></B></I>?<I>option value</I>?...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <H2><A NAME="sect2" HREF="#toc2">Description</A></H2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The <B>eps</B> canvas item lets you place
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-encapulated PostScript (EPS) on a canvas, controlling its size and placement.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++encapsulated PostScript (EPS) on a canvas, controlling its size and placement.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The EPS item is displayed either as a solid rectangle or a preview image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The preview image is designated in one of two ways: 1) the EPS file contains
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-an ASCII hexidecimal preview, or 2) a Tk photo image. When the canvas generates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++an ASCII hexadecimal preview, or 2) a Tk photo image. When the canvas generates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PostScript output, the EPS will be inserted with the proper translation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and scaling to match that of the EPS item. So can use the canvas widget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as a page layout tool.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <CODE><I>canvas <B>create eps <I>x y </I></B></I>?<I>option value</I>?...<BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </CODE><P>The <B>eps</B> item creates a new canvas item. <I>Canvas</I> is the name of a <B>canvas</B> widget.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You must supply the X-Y coordinate of the new eps item. How the coordinate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-is exactly interpretered is controlled by the <B>-anchor</B> option (see below).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++is exactly interpreted is controlled by the <B>-anchor</B> option (see below).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Additional options may be specified on the command line to configure aspects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of the eps item such as its color, stipple, and font. The following <I>option</I>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/container.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/container.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,7 +136,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size of the container window is determined the number of tiers of tabs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and the sizes of the Tk widgets embedded inside each folder. The widest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ widget determines the width of the folder. The tallest determines the height.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- If no folders contain an embedded widget, the size is detemined solely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ If no folders contain an embedded widget, the size is determined solely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ by the size of the tabs. <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You can override either dimension with the container's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <B>-width</B> and <B>-height</B> options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/hierbox.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/hierbox.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1446,7 +1446,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DT><B>-separator <I>string</I></B> </DT>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DD>Specifies the character sequence
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-to use when spliting the path components. The separator may be several
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++to use when splitting the path components. The separator may be several
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ characters wide (such as "::") Consecutive separators in a pathname are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ treated as one. If <I>string</I> is the empty string, the pathnames are Tcl lists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Each element is a path component. The default is <I>""</I>. </DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/bitmap.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/bitmap.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label .l -bitmap gray1<BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </CODE><P>Tk will recognize "gray1" as a bitmap which can now be used with any widget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that accepts bitmaps. <BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<CODE></CODE><P>The bitmap data can be specified in a mulitude of forms. The following commands
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<CODE>.barchart element configure elem1 -stipple gray1<BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++</CODE><P>The bitmap data can be specified in a multitude of forms. The following commands
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ are all equivalent. <BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <CODE>bitmap define gray1 {<BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define gray1_width 2<BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,7 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DD>Specifies the scale of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the bitmap. <I>Value</I> is a real number representing the scale. A scale of 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ indicates no scaling is necessary, while 2.0 would double the size of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bitmap. There is no way to specify differents scales for the width and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bitmap. There is no way to specify different scales for the width and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ height of the bitmap. The default scale is <I>1.0</I>. </DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </DL>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </blockquote>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +162,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DT><B>-scale <I>value</I></B> </DT>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DD>Specifies how to scale the bitmap. <I>Value</I> is a real number representing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the scale. A scale of 1.0 indicates no scaling is necessary, while 2.0 would
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-double the size of the bitmap. There is no way to specify differents scales
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++double the size of the bitmap. There is no way to specify different scales
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for the width and height of the bitmap. The default scale is <I>1.0</I>. </DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </DL>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </blockquote>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/tree.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/tree.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -641,7 +641,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P><DT><A NAME="M55"><B>-reverse</B></A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Reverse the direction of the copy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P><DT><A NAME="M56"><B>-tags</B></A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Copy tag inforation. Normally the following node is copied: its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Copy tag information. Normally the following node is copied: its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label and data fields. This indicates to copy tags as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P></DL>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P><DT><A NAME="M57"><I>treeName</I> <B>create</B> ?<I>switches</I>?</A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -870,7 +870,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DL class="tree operations">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DT><A NAME="M120"><B>breadthfirst</B></A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Process the node and the subtrees at each sucessive level. Each node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Process the node and the subtrees at each successive level. Each node
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on a level is processed before going to the next level.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P><DT><A NAME="M121"><B>inorder</B></A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Recursively process the nodes of the first subtree, the node itself,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1587,7 +1587,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ indicating the operations that are traced (it's in the same
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ form as <I>ops</I>) and, the command prefix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P><DT><A NAME="M267"><I>treeName</I> <B>trace names</B></A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Returns a list of identifers for all the current traces.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Returns a list of identifiers for all the current traces.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P></DL>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <H3><A NAME="M268">NOTIFY OPERATIONS</A></H3>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tree objects can be shared among many clients, such as a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1672,7 +1672,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It consists of the notify id, a sublist of event flags (it's in the same
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ form as <I>flags</I>) and, the command prefix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P><DT><A NAME="M283"><I>treeName</I> <B>notify names</B></A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Returns a list of identifers for all the current notifiers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Returns a list of identifiers for all the current notifiers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P></DL>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <H3><A NAME="M284">TABLE EXAMPLE</A></H3>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/spline.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/spline.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curve. Spline interpolation is the mathematical equivalent. The curves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ between adjacent knots are piecewise functions such that the resulting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spline runs exactly through all the knots. The order and coefficients of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-the polynominal determine the "looseness" or "tightness" of the curve fit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++the polynomial determine the "looseness" or "tightness" of the curve fit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from the line segments formed by the knots. <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The <B>spline</B> command performs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spline interpolation using cubic ("natural") or quadratic polynomial functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .graph element create spline -x sx -y sy -color red<BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table . .graph<BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </CODE><P>The <B>natural</B> operation employs a cubic interpolant when forming the spline.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- In terms of the draftmen's spline, a <I>natural spline</I> requires the least
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ In terms of the draftsmen's spline, a <I>natural spline</I> requires the least
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ amount of energy to bend the spline (strip of wood), while still passing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ through each knot. In mathematical terms, the second derivatives of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ first and last points are zero. <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ by D.F.Mcallister & J.A.Roulier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Coded by S.L.Dodd & M.Roulier N.C.State University.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-</PRE>The original code for the quadratric spline can be found in TOMS #574.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++</PRE>The original code for the quadratic spline can be found in TOMS #574.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <H2><A NAME="sect7" HREF="#toc7">Keywords</A></H2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spline,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vector, graph <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/bgexec.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/bgexec.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,7 +122,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Specifies the encoding of the stderr channel. This affects only data returned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to the Tcl interpreter. No translation is done on file redirection. <BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ For example if data is to be converted from Unicode for use in Tcl, you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-would use the "unicode" encoding. The default is that no tranlation is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++would use the "unicode" encoding. The default is that no translation is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ performed. </DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DT><B>-decodeoutput <I>encodingName</I></B> </DT>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,7 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Specifies the encoding of the stdout channels. This affects only data returned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to the Tcl interpreter. No translation is done on file redirection. <BR>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ For example if data is to be converted from Unicode for use in Tcl, you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-would use the "unicode" encoding. The default is that no tranlation is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++would use the "unicode" encoding. The default is that no translation is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ performed. </DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DT><B>-error <I>varName</I></B> </DT>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -234,7 +234,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </CODE><P>The biggest advantage of <B>bgexec</B> is that, unlike <B>fileevent</B>, it requires
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no additional Tcl code to run a program. It's simpler and less error prone.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- You don't have to worry about non-blocking I/O. It's handled tranparently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ You don't have to worry about non-blocking I/O. It's handled transparently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for you. <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <B>Bgexec</B> runs programs that <B>fileevent</B> can not. <B>Fileevent</B> assumes that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the when stdout is closed the program has completed. But some programs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/table.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/table.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <B>table search <I>container</I></B> ?<I>switch arg</I>?...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <H2><A NAME="sect2" HREF="#toc2">Description</A></H2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The <B>table</B> command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-arranges widgets in a table. The alignment of widgets is detemined by their
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++arranges widgets in a table. The alignment of widgets is determined by their
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ row and column positions and the number of rows or columns that they span.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <H2><A NAME="sect3" HREF="#toc3">Introduction</A></H2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,7 +241,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of a widget. <I>Item</I> can be in any form describe in the <B>configure</B> operation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ below. If no <I>item</I> argument is provided, then the configuration option is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for the table itself. <I>Option</I> may be any one of the options described in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-the appropiate section for <I>item</I>. </DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++the appropriate section for <I>item</I>. </DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DT><B>table configure</B> <I>container item</I>... ?<I>option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value</I>?... </DT>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/tabset.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/tabset.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,7 +241,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabs and the sizes of the Tk widgets embedded inside each folder.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The widest widget determines the width of the folder. The tallest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ determines the height. If no folders contain an embedded widget, the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size is detemined solely by the size of the tabs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++size is determined solely by the size of the tabs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You can override either dimension with the tabset's <B>-width</B>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and <B>-height</B> options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -762,7 +762,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be aligned with the leftmost edge of the folder. The default value is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <B>center</B>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P><DT><A NAME="M110"><B>-background </B><I>color</I></A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Sets the background color for <I>nameOrIndex</I>. Setting this option overides the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Sets the background color for <I>nameOrIndex</I>. Setting this option overrides the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ widget's <B>-tabbackground</B> option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <P><DT><A NAME="M111"><B>-bindtags </B><I>tagList</I></A><DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Specifies the binding tags for this tab. <I>TagList</I> is a list of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/barchart.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/barchart.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -332,7 +332,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DT><B>-barwidth <I>value</I></B> </DT>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <DD>Specifies the width
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-of the bars. This value can be overrided by the individual elements using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++of the bars. This value can be overridden by the individual elements using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ their <B>-barwidth</B> configuration option. <I>Value</I> is the width in terms of graph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ coordinates. The default width is <I>1.0</I>. </DD>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/html/winop.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/html/winop.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <H2><A NAME="sect2" HREF="#toc2">Description</A></H2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The <B>winop</B> command performs various window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and image operations on Tk windows using low-level Xlib function calls to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-work around window manager pecularities.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++work around window manager peculiarities.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <H2><A NAME="sect3" HREF="#toc3">Introduction</A></H2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk has several commands
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for manipulating its windows: <B>raise</B>, <B>lower</B>, <B>wm</B>, etc. These commands ask
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/stripchart.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/stripchart.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++'\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '\" Copyright 1991-1997 by Bell Labs Innovations for Lucent Technologies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '\" Permission to use, copy, modify, and distribute this software and its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2061,7 +2062,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ terminates that script and skips any remaining scripts for the event,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ just as for the bind command.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-The \fB\-bindtags\R option for these components controls addition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++The \fB\-bindtags\fR option for these components controls addition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tag names which can be matched. Implicitly elements and markers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ always have tags matching their names. Setting the value of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the \fB\-bindtags\fR option doesn't change this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2160,9 +2161,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .CS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Works for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \&.s legend configure -mapped no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Instead use this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \&.s legend configure -hide yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.CE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.CE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH KEYWORDS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stripchart, graph, widget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/vector.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/vector.mann
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1277,7 +1277,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .CS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <tcl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <blt.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\&...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Vector *vecPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double *newArr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *f;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/man/Blt_TreeGetNode.man3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/man/Blt_TreeGetNode.man3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int number;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeToken token;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\&...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = Blt_TreeGetNode(token, number);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (node == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("no node with ID %d exists\\n", number);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/install.patch b/x11/blt/files/install.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..82bbb78
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/install.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,180 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch fixes installing directories and copying files under
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_ROOT. Also, it adds bltOldConfig.h to the installable headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list and fixes it to include tk.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Chris Waters and Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Steve Langasek <vorlon@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Mon, 31 Aug 2015 12:37:00 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,9 +47,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd library; $(MAKE) install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd man; $(MAKE) install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd demos; $(MAKE) install)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdirs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @for i in $(instdirs) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " mkdir $(INSTALL_ROOT)$$i" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir $(INSTALL_ROOT)$$i ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir -p $(INSTALL_ROOT)$$i ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,10 +66,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd library; $(MAKE) clean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd man; $(MAKE) clean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd demos; $(MAKE) clean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(RM) *.bak *\~ "#"* *pure* .pure*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(RM) *.bak *\~ "#"* .pure*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GENERATED_FILES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.status config.cache config.log Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distclean: clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd generic; $(MAKE) distclean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd library; $(MAKE) distclean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd man; $(MAKE) distclean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd demos; $(MAKE) distclean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $(GENERATED_FILES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/generic/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/generic/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/generic/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,6 +152,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltChain.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bltHash.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltList.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(srcdir)/bltOldConfig.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltPool.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltTree.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltDecls.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,7 +231,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " mkdir $(INSTALL_ROOT)$$i" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir $(INSTALL_ROOT)$$i ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir -p $(INSTALL_ROOT)$$i ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +263,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distclean: clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(RM) bltConfig.h Makefile TAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(RM) bltConfig.h bltHash.h Makefile TAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd shared; $(MAKE) distclean)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .c.o:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -c $(CC_SWITCHES) $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/generic/shared/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/generic/shared/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/generic/shared/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,14 +145,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(SHLIB_LIB_SPECS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Line above changed for complete dependency listings - gordon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $(SHLIB_LIB_SPECS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(tcl_only_lib_so): $(TCL_ONLY_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(SHLIB_TCL_ONLY_LIB_SPECS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(TCL_ONLY_LIB_SPECS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Line above changed for complete dependency listings - gordon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $(SHLIB_TCL_ONLY_LIB_SPECS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: mkdirs install-lib install-demo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,10 +181,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $(OBJS) $(lib_so) $(tcl_only_lib_so) $(bltwish) $(bltsh) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *pure* .pure*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *pure* .pure* bltInit.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distclean: clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in lieu of viewpath-ing...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/demos/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/demos/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/demos/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " mkdir $(INSTALL_ROOT)$$i" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir $(INSTALL_ROOT)"$$i" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir -p $(INSTALL_ROOT)"$$i" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/man/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/man/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/man/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " mkdir $(INSTALL_ROOT)$$i" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir $(INSTALL_ROOT)$$i ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir -p $(INSTALL_ROOT)$$i ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for i in $(miscFiles) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdirs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @for i in $(instdirs) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " mkdir $(INSTALL_ROOT)$$i" ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir $(INSTALL_ROOT)$$i ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir -p $(INSTALL_ROOT)$$i ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/generic/bltOldConfig.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/generic/bltOldConfig.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/generic/bltOldConfig.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Old config headers. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <tk.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN int Blt_ConfigureInfo _ANSI_ARGS_((Tcl_Interp * interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin, Tk_ConfigSpec * specs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char * widgRec, CONST char * argvName,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/ldflags.patch b/x11/blt/files/ldflags.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f04a9a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/ldflags.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch adds support for externally set LDFLAGS. It lets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ passing hardening flags from debian/rules. Also, the rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ definition is removed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Fri, 04 Jul 2014 09:29:39 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1061,7 +1061,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_TCL_ONLY_LIB_SPECS="${TCL_ONLY_LIB_SPECS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_TCL_ONLY_LIB_SPECS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS="${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RUN_PATH=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRA_LIB_SPECS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1197,13 +1197,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *-linux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *-linux*|*-gnu*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_CFLAGS="-fPIC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_LD="${CC}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LD_RUN_PATH=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS="${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRA_LIB_SPECS="-ldl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/shared/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/shared/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,7 +144,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(scriptdir)\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Line above changed for complete dependency listings - gordon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(srcdir)/bltInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TCL_ONLY_LIB_SPECS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Line above changed for complete dependency listings - gordon
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-Makefile.in b/x11/blt/files/patch-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cf54d34..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.org 2002-02-18 16:11:43.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2006-08-04 13:13:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DATA = @INSTALL_DATA@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_ROOT =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_ROOT = __DESTROOT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHELL = /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM = rm -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,9 +47,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd library; $(MAKE) install)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd man; $(MAKE) install)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd demos; $(MAKE) install)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdirs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @for i in $(instdirs) ; do \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-ac_prog_cc.diff b/x11/blt/files/patch-ac_prog_cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..897970c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/patch-ac_prog_cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in 2010-11-30 14:50:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in 2019-05-04 20:36:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BLT_ENV_CC=$CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BLT_ENV_CC=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CC search order
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-configure b/x11/blt/files/patch-configure
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 67ed8aa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.org 2006-04-25 00:21:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2006-04-25 00:27:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3401,8 +3401,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--TCL_LIB_DIR="${TCL_SRC_DIR}/$blt_platform"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--TK_LIB_DIR="${TK_SRC_DIR}/$blt_platform"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TCL_LIB_DIR="${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TK_LIB_DIR="${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x${blt_with_tcl_libraries}" != "x" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for libname in \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-demos-Makefile.in b/x11/blt/files/patch-demos-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 689b4fa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-demos-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- demos/Makefile.in.org 2002-02-18 16:11:46.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ demos/Makefile.in 2006-08-04 15:59:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM = rm -rf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DATA = @INSTALL_DATA@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_ROOT =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_ROOT = __DESTROOT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- instdirs = $(prefix) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(exec_prefix) \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-install_location.diff b/x11/blt/files/patch-install_location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..707e400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/patch-install_location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/demos/Makefile.in 2009-05-09 09:27:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/demos/Makefile.in 2019-05-05 12:44:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec_prefix = @exec_prefix@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = @BLT_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdir = @libdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-scriptdir = $(prefix)/lib/blt$(version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++scriptdir = $(prefix)/share/blt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destdir = $(scriptdir)/demos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcdir = @srcdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-library-Makefile.in b/x11/blt/files/patch-library-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 11fb5ff..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-library-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- library/Makefile.in.orig 2013-01-09 18:53:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ library/Makefile.in 2013-01-09 18:54:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DATA = @INSTALL_DATA@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_ROOT =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_ROOT = __DESTROOT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM = rm -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHELL = /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for i in $(miscFiles) ; do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdirs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @for i in $(instdirs) ; do \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-library-pkgIndex.tcl.in b/x11/blt/files/patch-library-pkgIndex.tcl.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4a49130..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-library-pkgIndex.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- library/pkgIndex.tcl.in.org 2006-04-25 00:22:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ library/pkgIndex.tcl.in 2006-04-25 00:27:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,9 +10,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the "lite" tcl-only version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info commands tk] == "tk" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set name ${prefix}BLT${version_no_dots}${suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set name libBLT.2.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set name ${prefix}BLTlite${version_no_dots}${suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set name libBLTlite.2.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global tcl_platform
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-man-Makefile.in b/x11/blt/files/patch-man-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f91cb65..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-man-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- man/Makefile.in.orig 2013-01-09 18:56:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ man/Makefile.in 2013-01-09 18:57:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DATA = @INSTALL_DATA@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_ROOT =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_ROOT = __DESTROOT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHELL = /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM = rm -rf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VPATH = $(srcdir)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-src-Makefile.in b/x11/blt/files/patch-src-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 411c684..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-src-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.org 2006-08-04 13:34:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2006-08-04 13:37:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,7 +143,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_SWITCHES = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DATA = @INSTALL_DATA@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_ROOT =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_ROOT = __DESTROOT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RANLIB = @RANLIB@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHELL = /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AR = ar rc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-src-shared-Makefile.in b/x11/blt/files/patch-src-shared-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8383ed6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-src-shared-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,70 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/shared/Makefile.in.org 2002-05-14 14:37:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/shared/Makefile.in 2006-08-04 15:05:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Makefile for shared version of BLT library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SHLIB_SUFFIX = @SHLIB_SUFFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SHLIB_SUFFIX = .dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version = @BLT_MAJOR_VERSION@@BLT_MINOR_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdir = @libdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindir = $(exec_prefix)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srcdir = @srcdir@/..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+instlibdir = @libdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- instdirs = $(exec_prefix) $(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,14 +115,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_SWITCHES = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DATA = @INSTALL_DATA@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_ROOT =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_ROOT = __DESTROOT__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHELL = /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM = rm -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN_S = @LN_S@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bltwish = bltwish$(version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bltsh = bltsh$(version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--lib_so = libBLT$(version)$(SHLIB_SUFFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--tcl_only_lib_so = libBLTlite$(version)$(SHLIB_SUFFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+lib_so = libBLT.2$(SHLIB_SUFFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tcl_only_lib_so = libBLTlite.2$(SHLIB_SUFFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: build_lib build_demo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,25 +145,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(scriptdir)\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/bltInit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(SHLIB_LIB_SPECS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o libBLT.2.4.dylib -install_name $(instlibdir)/$@ -compatibility_version 2.0 -current_version 2.4 bltInit.o $(OBJS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LIBS) ; $(LN_S) libBLT.2.4.dylib $(lib_so)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(tcl_only_lib_so): $(TCL_ONLY_OBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/bltInit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(SHLIB_TCL_ONLY_LIB_SPECS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(SHLIB_LD) $(SHLIB_LD_FLAGS) -o libBLTlite.2.4.dylib -install_name $(instlibdir)/$@ -compatibility_version 2.0 -current_version 2.4 bltInit.o $(TCL_ONLY_OBJS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(TCL_ONLY_LIB_SPECS) ; $(LN_S) libBLTlite.2.4.dylib $(tcl_only_lib_so)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: mkdirs install-lib install-demo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install-demo: $(bltwish)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install-demo: $(bltwish) $(bltsh)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -m 0755 bltwish$(version) $(INSTALL_ROOT)$(bindir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -m 0755 bltsh$(version) $(INSTALL_ROOT)$(bindir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-lib: $(lib_so) $(tcl_only_lib_so)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL) -m 0755 $(lib_so) $(INSTALL_ROOT)$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL) -m 0755 $(tcl_only_lib_so) $(INSTALL_ROOT)$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL) -m 0755 libBLT.2.4.dylib $(INSTALL_ROOT)$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL) -m 0755 libBLTlite.2.4.dylib $(INSTALL_ROOT)$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdirs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @for i in $(instdirs) ; do \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/patch-tk-8.6 b/x11/blt/files/patch-tk-8.6
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f956c09..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/files/patch-tk-8.6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tkButton.c.orig 2013-01-04 23:24:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tkButton.c 2013-01-04 23:28:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -526,8 +526,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static Blt_TileChangedProc TileChangedProc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int padX, int padY, int innerWidth, int innerHeight, int *xPtr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1890,7 +1888,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return TCL_OK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/pkgindex.patch b/x11/blt/files/pkgindex.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d3fee55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/pkgindex.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,90 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch fixes loading the libBLT library from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [package require BLT]. Specifically, it provides correct version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLT_PATCH_LEVEL and prevents loading the library twice (once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ by its real name and onr more time by a symlink if the blt-dev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ package is installed). Also, it skips initializing widget bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if Tk isn't present.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Steve Langasek <vorlon@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Mon, 31 Aug 2015 12:09:00 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix = @prefix@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec_prefix = @exec_prefix@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = @BLT_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++patchlevel = @BLT_PATCH_LEVEL@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib_prefix = @BLT_LIB_PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcdir = @srcdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdir = @libdir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkgIndex:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f pkgIndex.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's/%VERSION%/$(version)/' $(srcdir)/pkgIndex.tcl.in | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed -e 's/%PATCHLEVEL%/$(patchlevel)/' | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's/%LIB_PREFIX%/$(lib_prefix)/' | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's;%LIB_DIR%;$(libdir);' > pkgIndex.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/library/pkgIndex.tcl.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/library/pkgIndex.tcl.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/library/pkgIndex.tcl.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,11 +49,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![file exists $library] } continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ load $library BLT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set version "%VERSION%"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set patchlevel %PATCHLEVEL%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-package ifneeded BLT $version [list LoadBLT25 $version $dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++package ifneeded BLT $patchlevel [list LoadBLT25 $version $dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # End of package index file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/library/init.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/library/init.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/library/init.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- initializeLibrary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if {[info commands tk] == "tk"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ initializeLibrary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: blt-2.5.3+dfsg/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- blt-2.5.3+dfsg.orig/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ blt-2.5.3+dfsg/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -977,6 +977,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_MSG_CHECKING([BLT_PATCH_LEVEL])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CACHE_VAL(blt_cv_patch_level,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_GREP_SYMBOL(blt_cv_patch_level, BLT_PATCH_LEVEL, ${srcdir}/generic/blt.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_MSG_RESULT([$blt_cv_patch_level])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BLT_PATCH_LEVEL=${blt_cv_patch_level}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add BLT to the run path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdir=${exec_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1386,6 +1393,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(DEFINES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(BLT_MAJOR_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(BLT_MINOR_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_SUBST(BLT_PATCH_LEVEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(BLT_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(AUX_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(TCL_LIB_DIR)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/pointertoint.patch b/x11/blt/files/pointertoint.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7f12465
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/pointertoint.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,498 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch adds explicit casts to intptr_t or uintptr_t types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to prevent casting to/from pointer from/to integers of different size.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Wed, 09 Jul 2014 19:20:07 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltBgexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltBgexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -668,7 +668,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sinkPtr->name = name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sinkPtr->echo = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sinkPtr->fd = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sinkPtr->file = (Tcl_File)NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sinkPtr->file = (Tcl_File)0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sinkPtr->byteArr = sinkPtr->staticSpace;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sinkPtr->size = DEF_BUFFER_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sinkPtr->encoding = encoding;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -726,7 +726,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Free(sinkPtr->byteArr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sinkPtr->fd = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sinkPtr->file = (Tcl_File)NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sinkPtr->file = (Tcl_File)0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TCL_MAJOR_VERSION >= 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sinkPtr->objv != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -883,7 +883,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DeleteFileHandler(sinkPtr->fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sinkPtr->file = (Tcl_File)NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sinkPtr->file = (Tcl_File)0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sinkPtr->fd = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if WINDEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -424,7 +424,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeDestroyValues(nodePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UnlinkNode(nodePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ treeObjPtr->nNodes--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_FindHashEntry(&treeObjPtr->nodeTable, (char *)nodePtr->inode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_FindHashEntry(&treeObjPtr->nodeTable, (char *)(intptr_t)nodePtr->inode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_DeleteHashEntry(&treeObjPtr->nodeTable, hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nodePtr->inode = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -934,7 +934,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Generate an unique serial number for this node. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inode = treeObjPtr->nextInode++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_CreateHashEntry(&treeObjPtr->nodeTable,(char *)inode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_CreateHashEntry(&treeObjPtr->nodeTable,(char *)(intptr_t)inode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while (!isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nodePtr = NewNode(treeObjPtr, name, inode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1030,7 +1030,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isNew, result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ treeObjPtr = parentPtr->treeObject;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_CreateHashEntry(&treeObjPtr->nodeTable,(char *)inode, &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_CreateHashEntry(&treeObjPtr->nodeTable,(char *)(intptr_t)inode, &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!isNew) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1166,7 +1166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeObject *treeObjPtr = clientPtr->treeObject;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_HashEntry *hPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_FindHashEntry(&treeObjPtr->nodeTable, (char *)inode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_FindHashEntry(&treeObjPtr->nodeTable, (char *)(intptr_t)inode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (hPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (Blt_TreeNode)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1179,7 +1179,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_HashEntry *hPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_FindHashEntry(&treeObjPtr->nodeTable, (char *)inode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_FindHashEntry(&treeObjPtr->nodeTable, (char *)(intptr_t)inode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (hPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (Node*)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1641,7 +1641,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (parentId == -1) { /* Dump marks root's parent as -1. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = dataPtr->root;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a mapping between the old id and the new node */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_CreateHashEntry(&dataPtr->idTable, (char *)nodeId,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_CreateHashEntry(&dataPtr->idTable, (char *)(intptr_t)nodeId,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_SetHashValue(hPtr, node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeRelabelNode(cmdPtr->tree, node, names[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1651,7 +1651,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This can happen when there's a id collision with an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * existing node.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_FindHashEntry(&dataPtr->idTable, (char *)parentId);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_FindHashEntry(&dataPtr->idTable, (char *)(intptr_t)parentId);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (hPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parent = Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1688,7 +1688,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dataPtr->flags & RESTORE_OVERWRITE &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((node = Blt_TreeFindChild(parent, names[nNames - 1])))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a mapping between the old id and the new node */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_CreateHashEntry(&dataPtr->idTable, (char *)nodeId,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_CreateHashEntry(&dataPtr->idTable, (char *)(intptr_t)nodeId,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_SetHashValue(hPtr, node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1698,7 +1698,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = Blt_TreeCreateNode(cmdPtr->tree, parent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ names[nNames - 1], -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a mapping between the old id and the new node */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_CreateHashEntry(&dataPtr->idTable, (char *)nodeId,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_CreateHashEntry(&dataPtr->idTable, (char *)(intptr_t)nodeId,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_SetHashValue(hPtr, node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2196,7 +2196,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (node = Blt_ListFirstNode(patternList); node != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = Blt_ListNextNode(node)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- type = (int)Blt_ListGetValue(node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type = (intptr_t)Blt_ListGetValue(node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pattern = (char *)Blt_ListGetKey(node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (type) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3654,7 +3654,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (hPtr = Blt_FirstHashEntry(tablePtr, &cursor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hPtr != NULL; hPtr = Blt_NextHashEntry(&cursor)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_ChainAppend(chainPtr, (ClientData)Blt_TreeNodeId(node));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_ChainAppend(chainPtr, (ClientData)(intptr_t)Blt_TreeNodeId(node));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Iterate through this list to delete the nodes. By
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3664,7 +3664,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (linkPtr = Blt_ChainFirstLink(chainPtr); linkPtr != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linkPtr = nextPtr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nextPtr = Blt_ChainNextLink(linkPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = (int)Blt_ChainGetValue(linkPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ inode = (intptr_t)Blt_ChainGetValue(linkPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = Blt_TreeGetNode(cmdPtr->tree, inode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (node != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DeleteNode(cmdPtr, node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltUnixPipe.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltUnixPipe.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -508,7 +508,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Reap the child process now if an error occurred during its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * startup.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_WaitPid((Tcl_Pid)pid, &status, WNOHANG);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_WaitPid((Tcl_Pid)(intptr_t)pid, &status, WNOHANG);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (errPipeIn >= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CloseFile(errPipeIn);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -827,10 +827,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isNew) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refCount = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- refCount = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ refCount = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refCount++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_SetHashValue(hPtr, (ClientData)refCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_SetHashValue(hPtr, (intptr_t)refCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (Blt_Uid)Blt_GetHashKey(&uidTable, hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -864,12 +864,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (hPtr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int refCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- refCount = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ refCount = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refCount--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (refCount == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_DeleteHashEntry(&uidTable, hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_SetHashValue(hPtr, (ClientData)refCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_SetHashValue(hPtr, (intptr_t)refCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "tried to release unknown identifier \"%s\"\n", uid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -514,7 +514,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dostub = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags = (int)Tcl_GetAssocData(interp, BLT_THREAD_KEY, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = (intptr_t)Tcl_GetAssocData(interp, BLT_THREAD_KEY, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((flags & BLT_TCL_CMDS) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Tcl_AppInitProc **p;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Namespace *nsPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -573,7 +573,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetAssocData(interp, BLT_THREAD_KEY, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (ClientData)(flags | BLT_TCL_CMDS));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (ClientData)(intptr_t)(flags | BLT_TCL_CMDS));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef TCL_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((flags & BLT_TK_CMDS) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -609,7 +609,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_InitEpsCanvasItem(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetAssocData(interp, BLT_THREAD_KEY, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (ClientData)(flags | BLT_TK_CMDS));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (ClientData)(intptr_t)(flags | BLT_TK_CMDS));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrAxis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrAxis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -669,7 +669,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec; /* Pointer to structure record. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset of field in structure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int mask = (unsigned int)clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int mask = (uintptr_t)clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Axis *axisPtr = (Axis *)widgRec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ticks **ticksPtrPtr = (Ticks **) (widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nTicks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3687,7 +3687,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int margin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* TODO: fix bug where "$g xaxis x2" leaves x unavailable. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- margin = (int)argv[-1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ margin = (intptr_t)argv[-1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chainPtr = graphPtr->margins[margin].axes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (argc == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (linkPtr = Blt_ChainFirstLink(chainPtr); linkPtr!= NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4231,7 +4231,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (proc == UseOp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv[2] = (char *)margin; /* Hack. Slide a reference to the margin in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argv[2] = (char *)(intptr_t)margin; /* Hack. Slide a reference to the margin in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the argument list. Needed only for UseOp.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = (*proc)(graphPtr, NULL, argc - 3, argv +3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrBar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrBar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2197,13 +2197,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isNew) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ count = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- count = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count == 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nStacks++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ count++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_SetHashValue(hPtr, (ClientData)count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_SetHashValue(hPtr, (ClientData)(intptr_t)count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nSegs == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2219,12 +2219,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infoPtr = graphPtr->freqArr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (hPtr = Blt_FirstHashEntry(&freqTable, &cursor); hPtr != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hPtr = Blt_NextHashEntry(&cursor)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- count = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keyPtr = (FreqKey *)Blt_GetHashKey(&freqTable, hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count > 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ h2Ptr = Blt_CreateHashEntry(&(graphPtr->freqTable),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)keyPtr, &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- count = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infoPtr->freq = count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infoPtr->axes = keyPtr->axes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_SetHashValue(h2Ptr, infoPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrMisc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrMisc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ColorPair *pairPtr = (ColorPair *)(widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ColorPair sample;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int allowDefault = (int)clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int allowDefault = (intptr_t)clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sample.fgColor = sample.bgColor = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((string != NULL) && (*string != '\0')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,7 +442,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec; /* Cubicle structure record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset of style in record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int mask = (unsigned int)clientData; /* Bit to be tested */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int mask = (uintptr_t)clientData; /* Bit to be tested */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *flagPtr = (int *)(widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int bool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -478,7 +478,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset of fill in widget record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_FreeProc **freeProcPtr; /* Not Used. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int mask = (unsigned int)clientData; /* Bit to be tested */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int mask = (uintptr_t)clientData; /* Bit to be tested */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int bool = *(unsigned int *)(widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (bool & mask) ? "1" : "0";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,7 +559,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset of pixel size in record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *valuePtr = (int *)(widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return Blt_GetPixels(interp, tkwin, string, (int)clientData, valuePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return Blt_GetPixels(interp, tkwin, string, (intptr_t)clientData, valuePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -648,7 +648,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset of pixel size in record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *valuePtr = (int *)(widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return Blt_GetInt(interp, string, (int)clientData, valuePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return Blt_GetInt(interp, string, (intptr_t)clientData, valuePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltContainer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltContainer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -822,7 +822,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *widgRec; /* Widget record */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int offset; /* Offset to field in structure */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int flags = (int)clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int flags = (uintptr_t)clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Container *cntrPtr = (Container *)widgRec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Window *winPtr = (Window *) (widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkAdopted;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltHierbox.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltHierbox.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2077,7 +2077,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Generate a unique node serial number. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ serial = hboxPtr->nextSerial++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_CreateHashEntry(&(hboxPtr->nodeTable), (char *)serial,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_CreateHashEntry(&(hboxPtr->nodeTable), (char *)(intptr_t)serial,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while (!isNew);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_SetHashValue(hPtr, treePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2372,7 +2372,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GetInt(NULL, string, &serial) == TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_HashEntry *hPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_FindHashEntry(&(hboxPtr->nodeTable), (char *)serial);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_FindHashEntry(&(hboxPtr->nodeTable), (char *)(intptr_t)serial);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (hPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (Tree *) Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2406,7 +2406,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int serial;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Node table keys are integers. Convert them to strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- serial = (int)Blt_GetHashKey(&(hboxPtr->nodeTable),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ serial = (intptr_t)Blt_GetHashKey(&(hboxPtr->nodeTable),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nodePtr->entryPtr->hashPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(string, "%d", serial);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltUnixImage.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltUnixImage.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -574,7 +574,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destPtr = Blt_ColorImageBits(image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endPtr = destPtr + nPixels;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (/* empty */; destPtr < endPtr; destPtr++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hPtr = Blt_FindHashEntry(&pixelTable, (char *)destPtr->value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hPtr = Blt_FindHashEntry(&pixelTable, (char *)(intptr_t)destPtr->value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colorPtr = (XColor *)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destPtr->Red = lut[colorPtr->red >> 8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destPtr->Green = lut[colorPtr->green >> 8];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2034,7 +2034,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key = 0; /* Initialize key to bogus span */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (node = Blt_ListFirstNode(list); node != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = Blt_ListNextNode(node)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- key = (int)Blt_ListGetKey(node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ key = (intptr_t)Blt_ListGetKey(node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr->row.span <= key) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2046,7 +2046,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Create a new list (bucket) to hold entries of that size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * span and and link it into the list of buckets.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- newNode = Blt_ListCreateNode(list, (char *)entryPtr->row.span);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ newNode = Blt_ListCreateNode(list, (char *)(intptr_t)entryPtr->row.span);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ListSetValue(newNode, (char *)Blt_ChainCreate());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ListLinkBefore(list, newNode, node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = newNode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2063,7 +2063,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (node = Blt_ListFirstNode(list); node != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = Blt_ListNextNode(node)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- key = (int)Blt_ListGetKey(node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ key = (intptr_t)Blt_ListGetKey(node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr->column.span <= key) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2075,7 +2075,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Create a new list (bucket) to hold entries of that size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * span and and link it into the list of buckets.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- newNode = Blt_ListCreateNode(list, (char *)entryPtr->column.span);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ newNode = Blt_ListCreateNode(list, (char *)(intptr_t)entryPtr->column.span);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ListSetValue(newNode, (char *)Blt_ChainCreate());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ListLinkBefore(list, newNode, node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = newNode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeView.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeView.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1314,10 +1314,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isNew) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refCount = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- refCount = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ refCount = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refCount++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_SetHashValue(hPtr, (ClientData)refCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_SetHashValue(hPtr, (ClientData)(intptr_t)refCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Blt_GetHashKey(&tvPtr->uidTable, hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1343,10 +1343,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hPtr = Blt_FindHashEntry(&tvPtr->uidTable, uid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(hPtr != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- refCount = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ refCount = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refCount--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (refCount > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_SetHashValue(hPtr, (ClientData)refCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_SetHashValue(hPtr, (ClientData)(intptr_t)refCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_DeleteHashEntry(&tvPtr->uidTable, hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeViewCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeViewCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -516,7 +516,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((context == ITEM_ENTRY) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (context == ITEM_ENTRY_BUTTON) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ((unsigned int)context >= (unsigned int)ITEM_STYLE)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((uintptr_t)context >= (uintptr_t)ITEM_STYLE)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entryPtr = Blt_GetCurrentItem(tvPtr->bindTable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltWinop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltWinop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -980,9 +980,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isNew) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_SetHashValue(hPtr, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cnt = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cnt = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cnt++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_SetHashValue(hPtr, cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_SetHashValue(hPtr, (intptr_t)cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcPtr++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -994,7 +994,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *objPtr = Tcl_NewStringObj(Blt_GetHashKey(&hTbl, hPtr), -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_ListObjAppendElement(interp, listPtr, objPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (iscnt) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cnt = (int)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cnt = (intptr_t)Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(buf, "%d", cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objPtr = Tcl_NewStringObj(buf, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_ListObjAppendElement(interp, listPtr, objPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltObjConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltObjConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1338,7 +1338,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GetBooleanFromObj(interp, objPtr, &bool) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flag = (unsigned int)specPtr->customPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flag = (uintptr_t)specPtr->customPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *(int *)ptr &= ~flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bool) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *(int *)ptr |= flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1639,7 +1639,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flag = (*(int *)ptr) & (unsigned int)specPtr->customPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flag = (*(unsigned int *)ptr) & (uintptr_t)specPtr->customPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Tcl_NewBooleanObj((flag != 0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/source.patch b/x11/blt/files/source.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b94e1fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/source.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,85 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch removes references to non-free dd_protocol/* files from makefiles.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It's a part of code which makes the original tarball DFSG-compliant. The rest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is in debian/rules (get-orig-source target).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/library/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,14 +34,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tclIndex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(cursors)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ddFiles = dd-color.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dd-file.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dd-number.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dd-text.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tclIndex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ddFiles = dd-color.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# dd-file.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# dd-number.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# dd-text.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# tclIndex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ instdirs = $(prefix) $(exec_prefix) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(libdir) $(prefix)/lib $(scriptdir) $(scriptdir)/dd_protocols
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(libdir) $(prefix)/lib $(scriptdir) #$(scriptdir)/dd_protocols
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: pkgIndex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,10 +53,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: mkdirs pkgIndex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for i in $(ddFiles) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_ROOT)$(scriptdir)/dd_protocols ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #for i in $(ddFiles) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # $(INSTALL_ROOT)$(scriptdir)/dd_protocols ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for i in $(miscFiles) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/library/Makefile.vc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/library/Makefile.vc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,11 +24,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tclIndex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(cursors)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ddFiles = dd-color.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dd-file.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dd-number.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dd-text.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tclIndex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ddFiles = dd-color.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# dd-file.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# dd-number.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# dd-text.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# tclIndex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ instdirs = $(prefix) $(exec_prefix) $(libdir) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(scriptdir) $(scriptdir)/dd_protocols $(libdir)/tcl$(v1) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,9 +44,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-ddfiles: install-dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for i in $(ddFiles) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i $(scriptdir)/dd_protocols ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #for i in $(ddFiles) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i $(scriptdir)/dd_protocols ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-files: install-dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for i in $(miscFiles) ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/win/install.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/win/install.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -pattern *.pro \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -file tclIndex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $scriptdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Add ${srcdir}/library/dd_protocols \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #Add ${srcdir}/library/dd_protocols \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -pattern *.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -file tclIndex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $scriptdir/dd_protocols
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/table.patch b/x11/blt/files/table.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ca4e451
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/table.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,123 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch restores blt::table command which was renamed to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ blt::blttable in 2.5.3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TODO: Make the blttable alias if necessary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Fri, 04 Jul 2014 09:22:10 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/demos/tour.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/demos/tour.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { $tcl_version >= 8.0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace import -force blt::*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- interp alias {} table {} blttable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #interp alias {} table {} blttable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #namespace import -force blt::tile::*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ source scripts/demo.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTable.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * out of or in connection with the use or performance of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * software.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * The "blttable" geometry manager was created by George Howlett.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * The "table" geometry manager was created by George Howlett.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Tk_GeomMgr tableMgrInfo =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "blttable", /* Name of geometry manager used by winfo */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "table", /* Name of geometry manager used by winfo */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WidgetGeometryProc, /* Procedure to for new geometry requests */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WidgetCustodyProc, /* Procedure when widget is taken away */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4955,7 +4955,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TableInit(interp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static Blt_CmdSpec cmdSpec = {"blttable", TableCmd, };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static Blt_CmdSpec cmdSpec = {"table", TableCmd, };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TableInterpData *dataPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dataPtr = GetTableInterpData(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/library/graph.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/library/graph.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -434,50 +434,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set row 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set col 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label $top.title -text "PostScript Options"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $top.title -cspan 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $top.title -cspan 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bool { center landscape maxpect preview decorations } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set w $top.$bool-label
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label $w -text "-$bool" -font *courier*-r-*12*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,$col $w -anchor e -pady { 2 0 } -padx { 0 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,$col $w -anchor e -pady { 2 0 } -padx { 0 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set w $top.$bool-yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global $graph.$bool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radiobutton $w -text "yes" -variable $graph.$bool -value 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,$col+1 $w -anchor w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,$col+1 $w -anchor w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set w $top.$bool-no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radiobutton $w -text "no" -variable $graph.$bool -value 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,$col+2 $w -anchor w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,$col+2 $w -anchor w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr row
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label $top.modes -text "-colormode" -font *courier*-r-*12*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,0 $top.modes -anchor e -pady { 2 0 } -padx { 0 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,0 $top.modes -anchor e -pady { 2 0 } -padx { 0 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set col 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach m { color greyscale } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set w $top.$m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radiobutton $w -text $m -variable $graph.colormode -value $m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,$col $w -anchor w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,$col $w -anchor w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr col
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set row 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame $top.sep -width 2 -bd 1 -relief sunken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,3 $top.sep -fill y -rspan 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,3 $top.sep -fill y -rspan 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set col 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach value { padx pady paperwidth paperheight width height } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set w $top.$value-label
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ label $w -text "-$value" -font *courier*-r-*12*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,$col $w -anchor e -pady { 2 0 } -padx { 0 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,$col $w -anchor e -pady { 2 0 } -padx { 0 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set w $top.$value-entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global $graph.$value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ entry $w -textvariable $graph.$value -width 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,$col+1 $w -cspan 2 -anchor w -padx 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,$col+1 $w -cspan 2 -anchor w -padx 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr row
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable configure $top c3 -width .125i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table configure $top c3 -width .125i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ button $top.cancel -text "Cancel" -command "destroy $top"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,0 $top.cancel -width 1i -pady 2 -cspan 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,0 $top.cancel -width 1i -pady 2 -cspan 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ button $top.reset -text "Reset" -command "destroy $top"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #blttable $top $row,1 $top.reset -width 1i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #blt::table $top $row,1 $top.reset -width 1i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ button $top.print -text "Print" -command "blt::ResetPostScript $graph"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $row,4 $top.print -width 1i -pady 2 -cspan 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ blt::table $top $row,4 $top.print -width 1i -pady 2 -cspan 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc blt::ResetPostScript { graph } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/library/tabnotebook.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/library/tabnotebook.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set top "$widget.toplevel-$id"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ toplevel $top
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $widget tab tearoff $tab $top.container
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- blttable $top $top.container -fill both
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ table $top $top.container -fill both
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr rootX 10 ; incr rootY 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wm geometry $top +$rootX+$rootY
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/tcl8.6.patch b/x11/blt/files/tcl8.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e760a7a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/tcl8.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,91 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch replaces the direct usage of deprecated interp->result
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ by Tcl_SetResult() and Tcl_GetStringResult() calls making it possible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to build using Tcl/Tk 8.6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Fri, 04 Jul 2014 09:20:48 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltScrollbar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltScrollbar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -588,7 +588,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fraction = ((double)pixels / (double)barWidth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf(interp->result, "%g", fraction);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(Tcl_GetStringResult(interp), "%g", fraction);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int x, y, pos, barWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double fraction;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTed.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTed.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1504,7 +1504,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->flags |= ARRANGE_PENDING;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- interp->result = Tk_PathName(tedPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tedPtr->flags |= LAYOUT_PENDING;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EventuallyRedraw(tedPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1678,7 +1678,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tedPtr->activeRectArr[4].width = grip - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tedPtr->activeRectArr[4].height = grip - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- interp->result = Tk_PathName(entryPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetResult(interp, (char*)Tk_PathName(entryPtr->tkwin), TCL_VOLATILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ active = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1751,7 +1751,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tablePtr->flags |= ARRANGE_PENDING;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- interp->result = Tk_PathName(tedPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tedPtr->flags |= LAYOUT_PENDING;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EventuallyRedraw(tedPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltVecMath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltVecMath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -834,20 +834,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((errno == EDOM) || (value != value)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp, "domain error: argument not in valid range",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", interp->result,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", Tcl_GetStringResult(interp),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if ((errno == ERANGE) || IS_INF(value)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (value == 0.0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "floating-point value too small to represent",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", interp->result,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", Tcl_GetStringResult(interp),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "floating-point value too large to represent",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", interp->result,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", Tcl_GetStringResult(interp),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -856,7 +856,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(buf, "%d", errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp, "unknown floating-point error, ",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "errno = ", buf, (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", interp->result,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", Tcl_GetStringResult(interp),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8560,7 +8560,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == TCL_CONTINUE ) continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == TCL_ERROR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "\n (\"tree foreach\" body line ", Blt_Itoa(interp->errorLine), ")\n", 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\n (\"tree foreach\" body line ", Blt_Itoa(Tcl_GetErrorLine(interp)), ")\n", 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result != TCL_OK) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/tk8.6.patch b/x11/blt/files/tk8.6.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3de6c0e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/tk8.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch replaces call to TkCopyAndGlobalEval by a call to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_EvalObjEx because the former function has been dropped in Tk 8.6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Fri, 04 Jul 2014 09:18:32 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -864,8 +864,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Blt_TileChangedProc TileChangedProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int padX, int padY, int innerWidth, int innerHeight, int *xPtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3292,7 +3290,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((butPtr->type > TYPE_LABEL) && (butPtr->command != NULL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_DString buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_DStringInit(&buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_DStringAppend(&buf, butPtr->command, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int code = Tcl_EvalEx(butPtr->interp, Tcl_DStringValue(&buf), Tcl_DStringLength(&buf), TCL_EVAL_GLOBAL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_DStringFree(&buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return code;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/uninitialized.patch b/x11/blt/files/uninitialized.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..99b3c55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/uninitialized.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,278 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch initializes all variables for which GCC gave warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ about unitialized or maybe unitialized variables.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Wed, 09 Jul 2014 19:17:02 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltArrayObj.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltArrayObj.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,6 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nElem%2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (interp != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string = Tcl_GetString(objPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp, "odd length: ", string, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltBgexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltBgexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,6 +559,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *lengthPtr = length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *lengthPtr = length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -603,6 +604,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *lengthPtr = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8086,7 +8086,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeKeySearch keyIter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int vobjc, kobjc, i, result = TCL_OK, len, cnt = 0, isar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nobreak = 0, noupdate = 0, unset = 0, init = 0, aLen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *var, *string, *aName, *aPat = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *var, *string, *aName = NULL, *aPat = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int klen, kl, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *keySet = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltVector.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltVector.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1896,7 +1896,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i=2; i<objc; i+=2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int option, *ovar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int option, *ovar = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GetIndexFromObj(interp, objv[i], optionArr, "option",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0, &option) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrAxis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrAxis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1426,7 +1426,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nMajor = nMinor = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ majorStep = minorStep = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (min < max) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (min > max) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double m;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m = min;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ min = max;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ max = m;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else if (min == max) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ max = min + 1.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* if (min < max) { */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ min = (min != 0.0) ? log10(FABS(min)) : 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max = (max != 0.0) ? log10(FABS(max)) : 1.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1474,7 +1482,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (DEFINED(axisPtr->reqMax)))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tickMax = max;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* } */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ axisPtr->majorSweep.step = majorStep;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ axisPtr->majorSweep.initial = floor(tickMin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ axisPtr->majorSweep.nSteps = nMajor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1556,7 +1564,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nTicks = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tickMin = tickMax = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (min < max) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (min > max) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double m;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m = min;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ min = max;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ max = m;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else if (min == max) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ max = min + 1.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* if (min < max) { */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ range = max - min;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Calculate the major tick stepping. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1578,7 +1594,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ axisMax = tickMax = ceil(max / step) * step + 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nTicks = Round((tickMax - tickMin) / step) + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* } */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ axisPtr->majorSweep.step = step;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ axisPtr->majorSweep.initial = tickMin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ axisPtr->majorSweep.nSteps = nTicks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltGrLine.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltGrLine.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3085,8 +3085,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Point2D *pointPtr, *endPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- i = -1; /* Suppress compiler warning. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ i = searchPtr->index;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minDist = searchPtr->dist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ closest = searchPtr->point;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (linkPtr = Blt_ChainFirstLink(linePtr->traces); linkPtr != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linkPtr = Blt_ChainNextLink(linkPtr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tracePtr = Blt_ChainGetValue(linkPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3140,8 +3141,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Segment2D *s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- i = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ i = searchPtr->index;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minDist = searchPtr->dist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ closest = searchPtr->point;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s = linePtr->strips;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (count = 0; count < linePtr->nStrips; count++, s++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dist = (*distProc)(searchPtr->x, searchPtr->y, &(s->p), &(s->q), &b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltBeep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltBeep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,9 +58,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[0], " ?volumePercent?\"", (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (argc == 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- percent = 50; /* Default setting */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else if (argc == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (argc == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GetInt(interp, argv[1], &percent) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,6 +67,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv[1], "\"", (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ percent = 50; /* Default setting */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XBell(Tk_Display(Tk_MainWindow(interp)), percent);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltConfig.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -977,6 +977,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dropOffset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colorPtr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ color2Ptr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dropOffset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((string != NULL) && (string[0] != '\0')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nElem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltHtext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltHtext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3100,6 +3100,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ forceCopy = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htPtr->last = htPtr->first - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lineNum = htPtr->first;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lastY = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Draw each line */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltImage.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltImage.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2738,7 +2738,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (opacity2<0.0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a1 = (1.0 - a2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- a2 = (opacity2<0.0 ? 0.0 : (opacity2>1.0?1.0:opacity2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ a1 = (opacity2<0.0 ? 0.0 : (opacity2>1.0?1.0:opacity2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (endPtr = destPtr + count; destPtr < endPtr; srcPtr++, src2Ptr++, destPtr++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTabnotebook.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTabnotebook.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2430,7 +2430,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int cavityWidth, cavityHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dx, dy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x, y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x = 0, y = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nbPtr = tabPtr->nbPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pad = nbPtr->inset + nbPtr->inset2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTabset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTabset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5771,14 +5771,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * side when correcting for left/right slants.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (setPtr->side) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case SIDE_TOP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case SIDE_BOTTOM:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (setPtr->slant == SLANT_LEFT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x += setPtr->overlap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else if (setPtr->slant == SLANT_RIGHT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x -= setPtr->overlap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case SIDE_LEFT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case SIDE_RIGHT:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (setPtr->slant == SLANT_LEFT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5787,6 +5779,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y -= setPtr->overlap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case SIDE_TOP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case SIDE_BOTTOM:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (setPtr->slant == SLANT_LEFT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x += setPtr->overlap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else if (setPtr->slant == SLANT_RIGHT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x -= setPtr->overlap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5817,7 +5818,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iw = imgWidth = ImageWidth(image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ih = imgHeight = ImageHeight(image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- img2Width = img2Height = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ iw2 = ih2 = img2Width = img2Height = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (image2 != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iw2 = img2Width = ImageWidth(image2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ih2 = img2Height = ImageHeight(image2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5847,6 +5848,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tx = x + (tabPtr->screenWidth - tabPtr->textWidth) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case SIDE_TOP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tx = x + (tabPtr->screenWidth - tabPtr->textWidth) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ty = y + dy + tabPtr->iPadY.side1 + IMAGE_PAD;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ix = x + (tabPtr->screenWidth - iw) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5915,6 +5917,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i2x = x + (tabPtr->screenWidth - iw2) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case SIDE_TOP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i2y = iy + imgHeight + IMAGE_PAD + setPtr->gapLeft;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i2x = x + (tabPtr->screenWidth - iw2) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1701,7 +1701,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC newGC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long mask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Image image;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *oldTextVar, *oldSelVar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *oldTextVar = NULL, *oldSelVar = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Tree oldTree;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int oldNode, result = TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char * oldABdStr = butPtr->activeBdImageString;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1721,8 +1721,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Blt_ConfigureWidget(interp, butPtr->tkwin, configSpecs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc, argv, (char *)butPtr, flags) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (oldTextVar) ckfree(oldTextVar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (oldTextVar) ckfree(oldSelVar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (oldTextVar != NULL) ckfree(oldTextVar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (oldSelVar != NULL) ckfree(oldSelVar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/unused.patch b/x11/blt/files/unused.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4cf7366
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/unused.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,899 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch deletes or comments out all unused variables.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Sergei Golovan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Wed, 09 Jul 2014 19:18:23 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1234,7 +1234,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeRelabelNode(TreeClient *clientPtr, Node *nodePtr, CONST char *string)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int result, inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((result=NotifyClients(clientPtr, clientPtr->treeObject, nodePtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TREE_NOTIFY_RELABEL)) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1245,7 +1245,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * been created.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SetModified(nodePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = nodePtr->inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = NotifyClients(clientPtr, clientPtr->treeObject, nodePtr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TREE_NOTIFY_RELABELPOST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2078,10 +2078,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SetValues(TreeCmd *cmdPtr, Blt_TreeNode node, int objc, Tcl_Obj *CONST *objv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = node->inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < objc; i += 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string = Tcl_GetString(objv[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((i + 1) == objc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2108,11 +2106,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int result = TCL_OK, inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int result = TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DString dStr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp = cmdPtr->interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = node->inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (objc % 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp, "odd # values", (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4552,7 +4549,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode parent = NULL, child = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int cnt = 0, i, n, m, vobjc, tobjc, dobjc, pobjc, optInd, iPos = -1, incr = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int hasoffs = 0, seqlabel = 0, seqVal = 0, hasstart = 0, start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int fixed = 0, hasnum = 0, hcnt = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int fixed = 0, hcnt = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *prefix = NULL, *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj **vobjv = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj **tobjv = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4628,7 +4625,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_GetIntFromObj(interp, objv[3], &cnt) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hasnum = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hcnt++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cnt<0 || cnt>10000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp, "count must be >= 0 and <= 10M", (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4982,13 +4978,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *listObjPtr, *objPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isNew, len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*char *string;*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TagSearch tagIter = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_InitHashTableWithPool(&keyTable, BLT_ONE_WORD_KEYS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 2; i < objc; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string = Tcl_GetStringFromObj(objv[i],&len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*string =*/ Tcl_GetStringFromObj(objv[i],&len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len == 0) continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (FindTaggedNodes(interp, cmdPtr, objv[i], &tagIter) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_DeleteHashTable(&keyTable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6525,7 +6521,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *valuePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i, result = TCL_OK, inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i, result = TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DString dStr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (GetNode(cmdPtr, objv[2], &node) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6540,7 +6536,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmdPtr->updTyp = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DStringInit(&dStr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = node->inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i=3; i<objc; i+=2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string = Tcl_GetString(objv[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Blt_TreeGetValue(interp, cmdPtr->tree, node, string,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6599,11 +6594,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *CONST *objv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*char *string;*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int count = 0, len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TagSearch cursor = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string = Tcl_GetStringFromObj(objv[2],&len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*string =*/ Tcl_GetStringFromObj(objv[2],&len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetObjResult(interp, Tcl_NewIntObj(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6834,7 +6829,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *CONST *objv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*char *string;*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int count = 0, result = TCL_OK, len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DString dStr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TagSearch cursor = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6844,7 +6839,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (objc<=3) return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string = Tcl_GetStringFromObj(objv[2], &len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*string =*/ Tcl_GetStringFromObj(objv[2], &len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetObjResult(interp, Tcl_NewIntObj(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7169,7 +7164,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *listObjPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *objPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isNew;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7177,7 +7171,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 3; i < objc; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TagSearch tcursor = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string = Tcl_GetString(objv[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (FindTaggedNodes(interp, cmdPtr, objv[i], &tcursor) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_ResetResult(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DoneTaggedNodes(&tcursor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7756,12 +7749,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *CONST *objv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int count = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TagSearch cursor = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string = Tcl_GetString(objv[2]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (FindTaggedNodes(interp, cmdPtr, objv[2], &cursor) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8084,7 +8074,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *valuePtr, *varObj, *nullObj = NULL, *nodeObj = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *hashObj = NULL, *starObj = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeKeySearch keyIter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int vobjc, kobjc, i, result = TCL_OK, len, cnt = 0, isar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int vobjc, kobjc, i, result = TCL_OK, len, cnt = 0/*, isar */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nobreak = 0, noupdate = 0, unset = 0, init = 0, aLen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *var, *string, *aName = NULL, *aPat = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int klen, kl, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8251,7 +8241,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isar = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* isar = 0; */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (arrName != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kl = strlen(aName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8526,7 +8516,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int len, result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *var, *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *var/*, *string*/;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TagSearch cursor = {0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ var = Tcl_GetString(objv[2]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8535,7 +8525,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_AppendResult(interp, "wrong number of args ", 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string = Tcl_GetStringFromObj(objv[3],&len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*string =*/ Tcl_GetStringFromObj(objv[3],&len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetObjResult(interp, Tcl_NewIntObj(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8894,6 +8884,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Obj Callback for sqlload.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int SqlCallbackObj(SqlData *sqlPtr, int argc, Tcl_Obj **objv, Tcl_Obj **azColName)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, j, rid, lid, n, tcid, vobjc, tobjc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9122,6 +9113,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef OMIT_SQLITE3_LOAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* #include <sqlite3.h> */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -438,9 +438,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DString dString;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONST char *value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef TCL_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int tkisinit = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef TCL_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!tkisinit) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct TileHandlers *thPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -510,7 +510,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Interpreter to add extra commands */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_BLT_STUBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dostub = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = (int)Tcl_GetAssocData(interp, BLT_THREAD_KEY, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((flags & BLT_TCL_CMDS) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltColor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltColor.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NCOLORS 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetPaletteSizes(nColors, nRedsPtr, nGreensPtr, nBluesPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nColors; /* Number of colors requested. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,6 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,6 +201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return numAvail;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FindClosestColor(colorPtr, mapColors, numMapColors)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ColorInfo *colorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,6 +344,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colorTabPtr->nPixels = nImageColors;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ColorTable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_CreateColorTable(tkwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -510,6 +513,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return colorTabPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * First attempt:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Allocate colors all the colors in the image (up to NCOLORS). Bail out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -548,6 +552,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_DeleteHashTable(&colorTable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return nColors;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define Blt_DefaultColormap(tkwin) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DefaultColormap(Tk_Display(tkwin), Tk_ScreenNumber(tkwin))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -563,11 +568,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int keepColors = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor usedColors[NCOLORS];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int nFreeColors, nUsedColors;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int nUsedColors;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Colormap colorMap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int inUse[NCOLORS];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *colorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XColor *imageColors;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* XColor *imageColors; */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Create a private colormap if one doesn't already exist for the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -582,7 +587,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XFreeColors(colorTabPtr->display, colorTabPtr->colorMap,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colorTabPtr->pixelValues, colorTabPtr->nPixels, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- nFreeColors = QueryColormap(colorTabPtr->display, colorMap, usedColors,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QueryColormap(colorTabPtr->display, colorMap, usedColors,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &nUsedColors);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset((char *)inUse, 0, sizeof(int) * NCOLORS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nUsedColors == 0) && (keepColors > 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,7 +597,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * have been used in the default colormap.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- nFreeColors = QueryColormap(colorTabPtr->display,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QueryColormap(colorTabPtr->display,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_DefaultColormap(tkwin), usedColors, &nUsedColors);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -622,7 +627,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * image as we can fit. If necessary, we'll cheat and reduce the number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * of colors by quantizing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- imageColors = usedColors + nUsedColors;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* imageColors = usedColors + nUsedColors; */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_SetWindowColormap(tkwin, colorMap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTabset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTabset.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3916,12 +3916,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int x, y; /* Screen coordinates of the test point. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tab *tabPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int dw, dh;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char coords[200];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ coords[0] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dw = Tk_Width(setPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dh = Tk_Height(setPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabPtr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((Tk_GetPixels(interp, setPtr->tkwin, argv[2], &x) != TCL_OK) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Tk_GetPixels(interp, setPtr->tkwin, argv[3], &y) != TCL_OK)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5247,18 +5244,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tab *startPtr, *nextPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ChainLink *linkPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Tab *tabPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x, maxWidth, sImg, eImg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x, maxWidth, sImg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int vert = (setPtr->side & SIDE_VERTICAL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sImg = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eImg = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (setPtr->startImage) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sImg = (vert?setPtr->startImage->height:setPtr->startImage->width);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (setPtr->endImage) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eImg = (vert?setPtr->endImage->height:setPtr->endImage->width);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tabsPerTier = (nTabs + (setPtr->nTiers - 1)) / setPtr->nTiers;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x = sImg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTile.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTile.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1176,10 +1176,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clientPtr->tilePtr->mask != None) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Pixmap mask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int xm, ym;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xm = clientPtr->xOrigin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ym = clientPtr->yOrigin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mask = RectangleMask(display, drawable, x, y, width, height,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tilePtr->mask, clientPtr->xOrigin, clientPtr->yOrigin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XSetClipMask(display, tilePtr->gc, mask);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeView.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeView.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5042,7 +5042,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && strlen(Tcl_GetString(tvPtr->imageCmd))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DString cmdString;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int result, rcnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int /*result,*/ rcnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp = tvPtr->interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string = Blt_GetHashKey(&tvPtr->iconTable, icon->hashPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5052,7 +5052,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (entryPtr) Tcl_Preserve(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (columnPtr) Tcl_Preserve(columnPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeViewPercentSubst(tvPtr, entryPtr, columnPtr, Tcl_GetString(tvPtr->imageCmd), string, &cmdString);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = Tcl_GlobalEval(interp, Tcl_DStringValue(&cmdString));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* result = */ Tcl_GlobalEval(interp, Tcl_DStringValue(&cmdString));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rcnt = icon->refCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeViewFreeIcon(tvPtr, icon);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((tvPtr->flags & TV_DELETED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5286,10 +5286,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewIcon *icons;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewIcon icon;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int isActive, hasFocus;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int isActive/*, hasFocus*/;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isActive = (entryPtr == tvPtr->activePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hasFocus = (entryPtr == tvPtr->focusPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*hasFocus = (entryPtr == tvPtr->focusPtr);*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ icons = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tvPtr->flags & TV_HIDE_ICONS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5879,9 +5879,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int x0, cx, xOffset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewStyle *sPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewIcon icon;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int mw, mh;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int mw/*, mh*/;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mw = Tk_Width(tvPtr->tkwin) - tvPtr->padX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mh = Tk_Height(tvPtr->tkwin) - tvPtr->padY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* mh = Tk_Height(tvPtr->tkwin) - tvPtr->padY; */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tvPtr->titleHeight < 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeViewCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeViewCmd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -668,10 +668,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hPtr = Blt_FirstHashEntry(tablePtr, &infoPtr->cursor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (hPtr != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = Blt_GetHashValue(hPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = node->inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infoPtr->entryPtr = Blt_NodeToEntry(tvPtr, node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (infoPtr->entryPtr == NULL && cnt++ == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* fprintf(stderr, "Dangling node: %d\n", node->inode); */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1689,13 +1687,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewEntry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewColumn *columnPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int n, result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *left, *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (GetEntryFromObj(tvPtr, objv[3], &entryPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- node = entryPtr->node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string = Tcl_GetString(objv[4]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Blt_TreeViewGetColumnKey(interp, tvPtr, objv[4], &columnPtr, &left)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ != TCL_OK || columnPtr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1777,7 +1773,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewEntry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewColumn *columnPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double dVal, dIncr = 1.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int iVal, iIncr = 1, isInt = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *objPtr, *valueObjPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1786,7 +1781,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (GetEntryFromObj(tvPtr, objv[3], &entryPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- node = entryPtr->node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string = Tcl_GetString(objv[4]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Blt_TreeViewGetColumnKey(interp, tvPtr, objv[4], &columnPtr, &left)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ != TCL_OK || columnPtr == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1841,7 +1835,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *CONST *objv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewEntry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *objPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1877,7 +1870,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key = Tcl_GetString(objv[4]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- node = entryPtr->node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Release(entryPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Blt_TreeGetValue(tvPtr->interp, tvPtr->tree, entryPtr->node,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key, &objPtr) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2656,7 +2648,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewEntry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isRoot, isTest;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x, y, wx, wy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x, y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int rootX, rootY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_GetRootCoords(tvPtr->tkwin, &rootX, &rootY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2693,8 +2685,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx = x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wy = y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isRoot) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x -= rootX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y -= rootY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3768,7 +3758,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nMatches, maxMatches, result, length, ocnt, useformat,userow, isvis;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int depth, maxdepth, mindepth, mask, istree, isleaf, invis, ismap, uselabel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isopen, isclosed, notop, nocase, isfull, cmdLen, docount, optInd, reldepth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int isnull, retLabel, isret, cmdValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int isnull, retLabel, isret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *colStr, *keysub;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *cmdObj, *cmdArgs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj **aobjv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3815,7 +3805,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reldepth = notop = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nocase = 0, isfull = 0, useformat = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keysub = colStr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cmdValue = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curValue = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmdObj = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmdArgs = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4663,7 +4652,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int length, depth = -1, maxdepth = -1, mindepth = -1, noArgs, usefull = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int result, nocase, uselabel = 0, optInd, ocnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *pattern, *curValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *curValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_List options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewEntry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Blt_ListNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4918,7 +4907,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error; /* This shouldn't happen. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pattern = Blt_ListGetValue(node);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objPtr = Tcl_GetObjResult(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = (*compareProc)(interp, Tcl_GetString(objPtr), kPtr, nocase);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == invertMatch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5192,10 +5180,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewColumn *columnPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewEntry *entryPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DString dStr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int optSkips, i, m, start, nOptions, inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int optSkips, i, m, start, nOptions/*, inode*/;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ useid = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*inode = -1;*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ optSkips = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sobjc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tobjc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5289,7 +5277,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addpath:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ node = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*inode = -1;*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (oLen == 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && (tvPtr->pathSep == SEPARATOR_NONE || tvPtr->pathSep == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && path[0] == '#' && strcmp(path, "#auto") == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5420,7 +5408,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ makeent:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inode = node->inode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*inode = node->inode;*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Blt_TreeViewCreateEntry(tvPtr, node, 0, options, BLT_CONFIG_OBJV_ONLY) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto opterror;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeViewColumn.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeViewColumn.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -413,7 +413,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int objc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_TreeNode node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeView *tvPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string = Tcl_GetString(objPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,7 +430,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\" must be in even name-value pairs", (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- node = entryPtr->node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tvPtr = entryPtr->tvPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < objc; i += 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -709,11 +707,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int n = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ChainLink *linkPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TreeViewColumn *columnPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (linkPtr = Blt_ChainFirstLink(tvPtr->colChainPtr); linkPtr != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linkPtr = Blt_ChainNextLink(linkPtr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- columnPtr = Blt_ChainGetValue(linkPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return n;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2477,7 +2473,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *CONST *objv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewColumn *colPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int width, height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Anchor anchor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int left, right;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2508,7 +2504,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ width = VPORTWIDTH(tvPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- height = VPORTHEIGHT(tvPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ left = tvPtr->xOffset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ right = tvPtr->xOffset + width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3342,11 +3337,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_IncrRefCount(entryPtr->dataObjPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_TreeKey key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*Blt_TreeKey key;*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *objPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int isFmt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- key = tvPtr->sortColumnPtr->key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*key = tvPtr->sortColumnPtr->key;*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isFmt = Blt_TreeViewStyleIsFmt(tvPtr, tvPtr->sortColumnPtr->stylePtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(p = tvPtr->flatArr; *p != NULL; p++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewValue *valuePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTreeViewStyle.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTreeViewStyle.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1600,15 +1600,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int textX, textY, textHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int gap, columnWidth, ttlWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int bool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int borderWidth, relief;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* int borderWidth, relief; */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TextLayout *textPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int boxX, boxY, boxWidth, boxHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewStyle *csPtr, sRec = *stylePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int valWidth = (valuePtr->textPtr?valuePtr->width:(icon?TreeViewIconWidth(icon):0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TextLayout *layPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int showValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- layPtr = (tvPtr->hideStyleText?NULL:valuePtr->textPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ showValue = (tvPtr->hideStyleText ? 0 : cbPtr->showValue);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ columnPtr = valuePtr->columnPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1617,13 +1615,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ drawTextBox(tvPtr, drawable, entryPtr, valuePtr, stylePtr, icon, x, y, &sRec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc = sRec.gc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (gc != stylePtr->activeGC) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* if (gc != stylePtr->activeGC) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ borderWidth = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ relief = TK_RELIEF_FLAT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ borderWidth = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ relief = TK_RELIEF_RAISED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ columnWidth = columnPtr->width - PADDING(columnPtr->pad);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!valuePtr->string) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2629,15 +2627,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewStyle *csPtr, sRec = *stylePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int valWidth = (valuePtr->textPtr?valuePtr->width:(icon?TreeViewIconWidth(icon):0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double curValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TextStyle ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *color;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TextLayout *layPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int showValue = (tvPtr->hideStyleText ? 0 : cbPtr->showValue);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- layPtr = (tvPtr->hideStyleText?NULL:valuePtr->textPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ textPtr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ columnPtr = valuePtr->columnPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ csPtr = columnPtr->stylePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3417,7 +3410,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewColumn *columnPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewWindowBox *tbPtr = (TreeViewWindowBox *)stylePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Window tkwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, height, diff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WindowCell *wcPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TreeViewStyle sRec = *stylePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3438,7 +3430,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int columnWidth = columnPtr->width -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (2 * columnPtr->borderWidth + PADDING(columnPtr->pad));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tkwin = wcPtr->tkwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ width = columnWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ height = entryPtr->height-1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((diff = (y-tvPtr->titleHeight- tvPtr->insetY))<0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltUnixDnd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltUnixDnd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1459,6 +1459,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MorphToken(dndPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dnd *dndPtr; /* Drag-and-drop manager (source). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1511,6 +1512,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RaiseToken(dndPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetTokenPosition(dndPtr, x, y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltWinop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltWinop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -913,7 +913,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_PhotoHandle srcPhoto;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_PhotoImageBlock src;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_ColorImage srcImage;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int top, x, y, isalph, iscnt, isNew, cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x, y, isalph, iscnt, isNew, cnt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, rng[4], from = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Pix32 *srcPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Obj *listPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -922,7 +922,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_HashTable hTbl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_HashSearch cursor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- top = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isalph = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iscnt = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (argc > 3) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1524,7 +1523,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double range[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double left[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x, y, width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x, width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor C;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *leftPtr, *rightPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1554,7 +1553,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ range[1] = (double)((rightPtr->green - leftPtr->green) / 257.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ range[2] = (double)((rightPtr->blue - leftPtr->blue) / 257.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y =0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (x = 0; x < width; x++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char cbuf[100];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t = ((double)( sin(M_PI_2 * (double)x / (double)width)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1574,7 +1572,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *leftPtr, *rightPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double range[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double left[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x, y, width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int x, width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor **destPtr, C;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1587,7 +1585,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ range[1] = (double)((rightPtr->green - leftPtr->green) / 257.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ range[2] = (double)((rightPtr->blue - leftPtr->blue) / 257.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y =0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ width = gradPtr->width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gradPtr->grads) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_FreeGradient(gradPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/tkButton.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -352,11 +352,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *string, char *widgRec, int offset, char *strList[], char *label )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *namePtr = (int *)(widgRec + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i=0; strList[i]; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c = string[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (strcmp(string, strList[i]) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *namePtr = i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -898,11 +896,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Button *butPtr = (Button*)widgRec;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int result, i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Image imgs[9], image;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (string && Tcl_SplitList(interp, string, &argc, &argv) != TCL_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1703,7 +1700,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Image image;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *oldTextVar = NULL, *oldSelVar = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Tree oldTree;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int oldNode, result = TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int result = TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char * oldABdStr = butPtr->activeBdImageString;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char * oldDBStr = butPtr->disabledBdImageString;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char * oldBDStr = butPtr->bdImageString;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1712,7 +1709,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ winPtr = (Tk_FakeWin *) (butPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oldTree = butPtr->tree;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- oldNode = butPtr->node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (oldTree == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ oldTextVar = (butPtr->textVarName?strdup(butPtr->textVarName):NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2219,7 +2215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the text to make the button appear to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * move up and down as the relief changes. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Tile tile, bgTile, inTile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int borderWidth, drawBorder;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int drawBorder;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int textXOffset, textYOffset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int haveImage = 0, haveText = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int imageWidth, imageHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2305,7 +2301,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bgTile = TILECHOOSE(bgTile,butPtr->innerTile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ border = butPtr->normalBorder;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- borderWidth = butPtr->borderWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc = butPtr->normalTextGC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltScrollbar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltScrollbar.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1017,7 +1017,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Scrollbar *scrollPtr = clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Tk_Window tkwin = scrollPtr->tkwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef notdef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XPoint points[7];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_3DBorder border;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int relief, width, elementBorderWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Pixmap pixmap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTed.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTed.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,10 +306,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DisplayTed _ANSI_ARGS_((ClientData clientData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DestroyTed _ANSI_ARGS_((DestroyData destroyData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DisplayEntry _ANSI_ARGS_((ClientData clientData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DestroyEntry _ANSI_ARGS_((DestroyData destoryData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Tcl_CmdProc TedCmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Tk_EventProc EntryEventProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Tk_EventProc TedEventProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,6 +364,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EventuallyRedrawEntry(repPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EntryRep *repPtr; /* Information about editor. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -369,6 +374,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_DoWhenIdle(DisplayEntry, repPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * --------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,6 +393,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * --------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EntryEventProc(clientData, eventPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Information about window. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -408,6 +415,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_EventuallyFree(repPtr, DestroyEntry);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * --------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -548,6 +556,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CreateEntry(tedPtr, entryPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ted *tedPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -614,6 +623,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/usetclint.patch b/x11/blt/files/usetclint.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fb51b11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/usetclint.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch adds missing headers which helps building BLT on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 64-bit architectures.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Matthias Klose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Sun, 06 Jul 2014 07:28:14 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltNsUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltNsUtil.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "bltInt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "bltList.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "bltNsUtil.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "tclInt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Namespace related routines */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -825,6 +825,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${TCL_INC_DIR}" != "${TK_INC_DIR}" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INC_SPECS="${INC_SPECS} -I${TCL_INC_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INC_SPECS="${INC_SPECS} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On Windows, override the default include directory with our own.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/files/usetkint.patch b/x11/blt/files/usetkint.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..deb67e4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/files/usetkint.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,1409 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Description: Patch removes internal definitions of the main Tk structures.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Since they have been changed since Tcl/Tk 8.4 it's much better to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include tkInt.h and other few headers. They are internal Tk headers,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ so the BLT library built with Tcl/Tk 8.6 won't work with Tcl/Tk 8.5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: FreeBSD BLT port maintainers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Modified: Fri, 04 Jul 2014 09:13:24 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltTkInt.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltTkInt.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,214 +27,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _BLT_TKINT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _BLT_TKINT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Uid family; /* Font family. The most important field. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int pointsize; /* Pointsize of font, 0 for default size, or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * negative number meaning pixel size. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int weight; /* Weight flag; see below for def'n. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int slant; /* Slant flag; see below for def'n. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int underline; /* Non-zero for underline font. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int overstrike; /* Non-zero for overstrike font. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkFontAttributes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int ascent; /* From baseline to top of font. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int descent; /* From baseline to bottom of font. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int maxWidth; /* Width of widest character in font. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int fixed; /* Non-zero if this is a fixed-width font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * 0 otherwise. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkFontMetrics;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkFontStruct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Fields used and maintained exclusively by generic code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER >= _VERSION(8,1,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int resourceRefCount; /* Number of active uses of this font (each
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * active use corresponds to a call to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Tk_AllocFontFromTable or Tk_GetFont).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * If this count is 0, then this TkFont
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * structure is no longer valid and it isn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * present in a hash table: it is being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * kept around only because there are objects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * referring to it. The structure is freed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * when resourceRefCount and objRefCount
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * are both 0. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int objRefCount; /* The number of Tcl objects that reference
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * this structure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int refCount; /* Number of users of the TkFont. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashEntry *cacheHashPtr;/* Entry in font cache for this structure,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * used when deleting it. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashEntry *namedHashPtr;/* Pointer to hash table entry that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponds to the named font that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * tkfont was based on, or NULL if the tkfont
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * was not based on a named font. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER >= _VERSION(8,1,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Screen *screen; /* The screen where this font is valid. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_VERSION_NUMBER >= 8.1.0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int tabWidth; /* Width of tabs in this font (pixels). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int underlinePos; /* Offset from baseline to origin of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * underline bar (used for drawing underlines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * on a non-underlined font). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int underlineHeight; /* Height of underline bar (used for drawing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * underlines on a non-underlined font). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Fields in the generic font structure that are filled in by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * platform-specific code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Font fid; /* For backwards compatibility with XGCValues
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * structures. Remove when TkGCValues is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * implemented. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkFontAttributes fa; /* Actual font attributes obtained when the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the font was created, as opposed to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * desired attributes passed in to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * TkpGetFontFromAttributes(). The desired
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * metrics can be determined from the string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * that was used to create this font. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkFontMetrics fm; /* Font metrics determined when font was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * created. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER >= _VERSION(8,1,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkFontStruct *nextPtr; /* Points to the next TkFont structure with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the same name. All fonts with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * same name (but different displays) are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * chained together off a single entry in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * a hash table. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_VERSION_NUMBER >= 8.1.0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkFont;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * This structure is used by the Mac and Window porting layers as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the internal representation of a clip_mask in a GC.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkRegionStruct *TkRegion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int type; /* One of TKP_CLIP_PIXMAP or TKP_CLIP_REGION */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- union {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Pixmap pixmap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkRegion region;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkpClipMask;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define TKP_CLIP_PIXMAP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define TKP_CLIP_REGION 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * The TkWinDrawable is the internal implementation of an X Drawable (either
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * a Window or a Pixmap). The following constants define the valid Drawable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * types.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define TWD_BITMAP 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define TWD_WINDOW 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define TWD_WINDC 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkWindowStruct TkWindow;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HWND handle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *winPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkWinWindow;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HBITMAP handle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Colormap colormap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int depth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkWinBitmap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HDC hdc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkWinDC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef union {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWinWindow window;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWinBitmap bitmap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWinDC winDC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkWinDrawable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * The TkWinDCState is used to save the state of a device context
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * so that it can be restored later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HPALETTE palette;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int bkmode; /* This field was added in Tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * 8.3.1. Be careful that you don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * use this structure in a context
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * where its size is important. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkWinDCState;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern HDC TkWinGetDrawableDC(Display *display, Drawable drawable,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWinDCState * state);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern HDC TkWinReleaseDrawableDC(Drawable drawable, HDC dc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWinDCState * state);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern HWND Tk_GetHWND _ANSI_ARGS_((Window window));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern HINSTANCE Tk_GetHINSTANCE _ANSI_ARGS_((void));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern Window Tk_AttachHWND _ANSI_ARGS_((Tk_Window tkwin, HWND hWnd));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* WIN32 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * The Border structure used internally by the Tk_3D* routines.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * The following is a copy of it from tk3d.c.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkBorderStruct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Screen *screen; /* Screen on which the border will be used. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Visual *visual; /* Visual for all windows and pixmaps using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the border. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int depth; /* Number of bits per pixel of drawables where
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the border will be used. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Colormap colormap; /* Colormap out of which pixels are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * allocated. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int refCount; /* Number of different users of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * this border. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER >= _VERSION(8,1,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int objRefCount; /* The number of Tcl objects that reference
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * this structure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_VERSION_NUMBER >= 8.1.0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XColor *bgColor; /* Background color (intensity between
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * lightColorPtr and darkColorPtr). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XColor *darkColor; /* Color for darker areas (must free when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * deleting structure). NULL means shadows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * haven't been allocated yet.*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XColor *lightColor; /* Color used for lighter areas of border
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * (must free this when deleting structure).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * NULL means shadows haven't been allocated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * yet. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Pixmap shadow; /* Stipple pattern to use for drawing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * shadows areas. Used for displays with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * <= 64 colors or where colormap has filled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * up. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GC bgGC; /* Used (if necessary) to draw areas in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the background color. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GC darkGC; /* Used to draw darker parts of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * border. None means the shadow colors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * haven't been allocated yet.*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GC lightGC; /* Used to draw lighter parts of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the border. None means the shadow colors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * haven't been allocated yet. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashEntry *hashPtr; /* Entry in borderTable (needed in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * order to delete structure). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkBorderStruct *nextPtr; /* Points to the next TkBorder structure with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the same color name. Borders with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * same name but different screens or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * colormaps are chained together off a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * single entry in borderTable. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkBorder;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <tkInt.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <tk3d.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <tkFont.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* BLT_TKINT_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltWindow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltWindow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,25 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <X11/Xproto.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkIdStackStruct TkIdStack;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkErrorHandlerStruct TkErrorHandler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkSelectionInfoStruct TkSelectionInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkClipboardTargetStruct TkClipboardTarget;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkWindowStruct TkWindow;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkWindowEventStruct TkWindowEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkMainInfoStruct TkMainInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkEventHandlerStruct TkEventHandler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkSelHandlerStruct TkSelHandler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkWinInfoStruct TkWinInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkClassProcsStruct TkClassProcs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkWindowPrivateStruct TkWindowPrivate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkGrabEventStruct TkGrabEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkColormapStruct TkColormap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkStressedCmapStruct TkStressedCmap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkWmInfoStruct TkWmInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <tkInt.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef XNQueryInputStyle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TK_USE_INPUT_METHODS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,766 +52,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TK_REPARENTED 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER >= _VERSION(8,1,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkCaret {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWindow *winPtr; /* the window on which we requested caret
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * placement */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int x; /* relative x coord of the caret */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int y; /* relative y coord of the caret */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int height; /* specified height of the window */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkCaret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * One of the following structures is maintained for each display
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * containing a window managed by Tk. In part, the structure is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * used to store thread-specific data, since each thread will have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * its own TkDisplay structure.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkDisplayStruct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Display *display; /* Xlib's info about display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkDisplayStruct *nextPtr; /* Next in list of all displays. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *name; /* Name of display (with any screen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * identifier removed). Malloc-ed. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Time lastEventTime; /* Time of last event received for this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used primarily by tk3d.c:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int borderInit; /* 0 means borderTable needs initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable borderTable; /* Maps from color name to TkBorder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * structure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkAtom.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int atomInit; /* 0 means stuff below hasn't been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * initialized yet. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable nameTable; /* Maps from names to Atom's. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable atomTable; /* Maps from Atom's back to names. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used primarily by tkBind.c:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int bindInfoStale; /* Non-zero means the variables in this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * part of the structure are potentially
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * incorrect and should be recomputed. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int modeModMask; /* Has one bit set to indicate the modifier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponding to "mode shift". If no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * such modifier, than this is zero. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int metaModMask; /* Has one bit set to indicate the modifier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponding to the "Meta" key. If no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * such modifier, then this is zero. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int altModMask; /* Has one bit set to indicate the modifier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponding to the "Meta" key. If no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * such modifier, then this is zero. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LU_IGNORE, LU_CAPS, LU_SHIFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } lockUsage; /* Indicates how to interpret lock modifier. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int numModKeyCodes; /* Number of entries in modKeyCodes array
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * below. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- KeyCode *modKeyCodes; /* Pointer to an array giving keycodes for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * all of the keys that have modifiers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * associated with them. Malloc'ed, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * may be NULL. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkBitmap.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int bitmapInit; /* 0 means tables above need initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int bitmapAutoNumber; /* Used to number bitmaps. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable bitmapNameTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Maps from name of bitmap to the first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * TkBitmap record for that name. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable bitmapIdTable;/* Maps from bitmap id to the TkBitmap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * structure for the bitmap. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable bitmapDataTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Used by Tk_GetBitmapFromData to map from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * a collection of in-core data about a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * bitmap to a reference giving an auto-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * matically-generated name for the bitmap. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkCanvas.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int numIdSearches;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int numSlowSearches;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Used by tkColor.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int colorInit; /* 0 means color module needs initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkStressedCmap *stressPtr; /* First in list of colormaps that have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * filled up, so we have to pick an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * approximate color. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable colorNameTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Maps from color name to TkColor structure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * for that color. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable colorValueTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Maps from integer RGB values to TkColor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * structures. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Used by tkCursor.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int cursorInit; /* 0 means cursor module need initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable cursorNameTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Maps from a string name to a cursor to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * TkCursor record for the cursor. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable cursorDataTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Maps from a collection of in-core data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * about a cursor to a TkCursor structure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable cursorIdTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Maps from a cursor id to the TkCursor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * structure for the cursor. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char cursorString[20]; /* Used to store a cursor id string. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Font cursorFont; /* Font to use for standard cursors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * None means font not loaded yet. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkError.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkErrorHandler *errorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of error handlers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * for this display. NULL means
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * no handlers exist at present. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int deleteCount; /* Counts # of handlers deleted since
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * last time inactive handlers were
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * garbage-collected. When this number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * gets big, handlers get cleaned up. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Used by tkEvent.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWindowEvent *delayedMotionPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Points to a malloc-ed motion event
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * whose processing has been delayed in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the hopes that another motion event
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * will come along right away and we can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * merge the two of them together. NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * means that there is no delayed motion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * event. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkFocus.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int focusDebug; /* 1 means collect focus debugging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * statistics. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWindow *implicitWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* If the focus arrived at a toplevel window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * implicitly via an Enter event (rather
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * than via a FocusIn event), this points
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * to the toplevel window. Otherwise it is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * NULL. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWindow *focusPtr; /* Points to the window on this display that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * should be receiving keyboard events. When
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * multiple applications on the display have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the focus, this will refer to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * innermost window in the innermost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * application. This information isn't used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * under Unix or Windows, but it's needed on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the Macintosh. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkGC.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable gcValueTable; /* Maps from a GC's values to a TkGC structure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * describing a GC with those values. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable gcIdTable; /* Maps from a GC to a TkGC. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int gcInit; /* 0 means the tables below need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkGeometry.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable maintainHashTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Hash table that maps from a master's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Tk_Window token to a list of slaves
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * managed by that master. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int geomInit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkGet.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable uidTable; /* Stores all Tk_Uids used in a thread. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int uidInit; /* 0 means uidTable needs initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkGrab.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWindow *grabWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Window in which the pointer is currently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * grabbed, or NULL if none. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWindow *eventualGrabWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Value that grabWinPtr will have once the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * grab event queue (below) has been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * completely emptied. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWindow *buttonWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Window in which first mouse button was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * pressed while grab was in effect, or NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * if no such press in effect. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWindow *serverWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* If no application contains the pointer then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * this is NULL. Otherwise it contains the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * last window for which we've gotten an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Enter or Leave event from the server (i.e.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the last window known to have contained
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the pointer). Doesn't reflect events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * that were synthesized in tkGrab.c. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkGrabEvent *firstGrabEventPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of enter/leave events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * synthesized by grab code. These events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * must be processed in order before any other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * events are processed. NULL means no such
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * events. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkGrabEvent *lastGrabEventPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Last in list of synthesized events, or NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * if list is empty. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int grabFlags; /* Miscellaneous flag values. See definitions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * in tkGrab.c. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkGrid.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int gridInit; /* 0 means table below needs initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable gridHashTable;/* Maps from Tk_Window tokens to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponding Grid structures. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkImage.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int imageId; /* Value used to number image ids. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkMacWinMenu.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int postCommandGeneration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkOption.c only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkPack.c only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int packInit; /* 0 means table below needs initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable packerHashTable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Maps from Tk_Window tokens to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponding Packer structures. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkPlace.c only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int placeInit; /* 0 means tables below need initializing. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable masterTable; /* Maps from Tk_Window toke to the Master
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * structure for the window, if it exists. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable slaveTable; /* Maps from Tk_Window toke to the Slave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * structure for the window, if it exists. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkSelect.c and tkClipboard.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkSelectionInfo *selectionInfoPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of selection information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * records. Each entry contains information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * about the current owner of a particular
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * selection on this display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom multipleAtom; /* Atom for MULTIPLE. None means
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * selection stuff isn't initialized. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom incrAtom; /* Atom for INCR. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom targetsAtom; /* Atom for TARGETS. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom timestampAtom; /* Atom for TIMESTAMP. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom textAtom; /* Atom for TEXT. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom compoundTextAtom; /* Atom for COMPOUND_TEXT. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom applicationAtom; /* Atom for TK_APPLICATION. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom windowAtom; /* Atom for TK_WINDOW. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom clipboardAtom; /* Atom for CLIPBOARD. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER >= _VERSION(8,4,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom utf8Atom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Window clipWindow; /* Window used for clipboard ownership and to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * retrieve selections between processes. NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * means clipboard info hasn't been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * initialized. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int clipboardActive; /* 1 means we currently own the clipboard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * selection, 0 means we don't. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkMainInfo *clipboardAppPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Last application that owned clipboard. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkClipboardTarget *clipTargetPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of clipboard type information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * records. Each entry contains information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * about the buffers for a given selection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * target. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkSend.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Window commTkwin; /* Window used for communication
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * between interpreters during "send"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * commands. NULL means send info hasn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * been initialized yet. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom commProperty; /* X's name for comm property. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom registryProperty; /* X's name for property containing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * registry of interpreter names. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom appNameProperty; /* X's name for property used to hold the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * application name on each comm window. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkXId.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkIdStack *idStackPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of chunks of free resource
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * identifiers, or NULL if there are no free
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * resources. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XID(*defaultAllocProc) _ANSI_ARGS_((Display *display));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Default resource allocator for display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkIdStack *windowStackPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of chunks of window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * identifers that can't be reused right
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * now. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER < _VERSION(8,4,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int idCleanupScheduled; /* 1 means a call to WindowIdCleanup has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * already been scheduled, 0 means it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * hasn't. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_TimerToken idCleanupScheduled;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* If set, it means a call to WindowIdCleanup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * has already been scheduled, 0 means it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * hasn't. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkUnixWm.c and tkWinWm.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER < _VERSION(8,4,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int wmTracing; /* Used to enable or disable tracing in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * this module. If tracing is enabled,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * then information is printed on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * standard output about interesting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * interactions with the window manager. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWmInfo *firstWmPtr; /* Points to first top-level window. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkWmInfo *foregroundWmPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Points to the foreground window. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information maintained by tkWindow.c for use later on by tkXId.c:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int destroyCount; /* Number of Tk_DestroyWindow operations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * in progress. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned long lastDestroyRequest;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Id of most recent XDestroyWindow request;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * can re-use ids in windowStackPtr when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * server has seen this request and event
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * queue is empty. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkVisual.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkColormap *cmapPtr; /* First in list of all non-default colormaps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * allocated for this display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Miscellaneous information:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef TK_USE_INPUT_METHODS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XIM inputMethod; /* Input method for this display */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XIMStyle inputStyle; /* Input style selected for this display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER >= _VERSION(8,4,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if TK_XIM_SPOT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XFontSet inputXfs; /* XFontSet cached for over-the-spot XIM. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_XIM_SPOT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_VERSION_NUMBER >= 8.4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_USE_INPUT_METHODS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable winTable; /* Maps from X window ids to TkWindow ptrs. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int refCount; /* Reference count of how many Tk applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * are using this display. Used to clean up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the display when we no longer have any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Tk applications using it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * The following field were all added for Tk8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int mouseButtonState; /* current mouse button state for this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * display */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Window mouseButtonWindow; /* Window the button state was set in, added
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * in Tk 8.4. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER < _VERSION(8,4,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int warpInProgress;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Window warpWindow;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int warpX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int warpY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_VERSION_NUMBER < _VERSION(8,4,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int useInputMethods; /* Whether to use input methods */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * The following field(s) were all added for Tk8.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* long deletionEpoch; * Incremented by window deletions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int flags; /* Various flag values: these are all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * defined in below. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkCaret caret; /* information about the caret for this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * display. This is not a pointer. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int iconDataSize; /* Size of default iconphoto image data. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned char *iconDataPtr; /* Default iconphoto image data, if set. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkDisplay;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * One of the following structures is maintained for each display
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * containing a window managed by Tk:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef struct TkDisplayStruct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Display *display; /* Xlib's info about display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct TkDisplayStruct *nextPtr; /* Next in list of all displays. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *name; /* Name of display (with any screen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * identifier removed). Malloc-ed. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Time lastEventTime; /* Time of last event received for this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used primarily by tkBind.c:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int bindInfoStale; /* Non-zero means the variables in this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * part of the structure are potentially
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * incorrect and should be recomputed. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int modeModMask; /* Has one bit set to indicate the modifier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponding to "mode shift". If no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * such modifier, than this is zero. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int metaModMask; /* Has one bit set to indicate the modifier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponding to the "Meta" key. If no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * such modifier, then this is zero. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int altModMask; /* Has one bit set to indicate the modifier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * corresponding to the "Meta" key. If no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * such modifier, then this is zero. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LU_IGNORE, LU_CAPS, LU_SHIFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } lockUsage;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Indicates how to interpret lock modifier. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int numModKeyCodes; /* Number of entries in modKeyCodes array
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * below. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- KeyCode *modKeyCodes; /* Pointer to an array giving keycodes for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * all of the keys that have modifiers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * associated with them. Malloc'ed, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * may be NULL. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkError.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkErrorHandler *errorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of error handlers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * for this display. NULL means
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * no handlers exist at present. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int deleteCount; /* Counts # of handlers deleted since
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * last time inactive handlers were
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * garbage-collected. When this number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * gets big, handlers get cleaned up. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkSend.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Window commTkwin; /* Window used for communication
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * between interpreters during "send"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * commands. NULL means send info hasn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * been initialized yet. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom commProperty; /* X's name for comm property. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom registryProperty; /* X's name for property containing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * registry of interpreter names. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom appNameProperty; /* X's name for property used to hold the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * application name on each comm window. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkSelect.c and tkClipboard.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkSelectionInfo *selectionInfoPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of selection information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * records. Each entry contains information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * about the current owner of a particular
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * selection on this display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom multipleAtom; /* Atom for MULTIPLE. None means
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * selection stuff isn't initialized. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom incrAtom; /* Atom for INCR. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom targetsAtom; /* Atom for TARGETS. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom timestampAtom; /* Atom for TIMESTAMP. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom textAtom; /* Atom for TEXT. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom compoundTextAtom; /* Atom for COMPOUND_TEXT. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom applicationAtom; /* Atom for TK_APPLICATION. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom windowAtom; /* Atom for TK_WINDOW. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Atom clipboardAtom; /* Atom for CLIPBOARD. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Window clipWindow; /* Window used for clipboard ownership and to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * retrieve selections between processes. NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * means clipboard info hasn't been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * initialized. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int clipboardActive; /* 1 means we currently own the clipboard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * selection, 0 means we don't. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkMainInfo *clipboardAppPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Last application that owned clipboard. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkClipboardTarget *clipTargetPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of clipboard type information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * records. Each entry contains information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * about the buffers for a given selection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * target. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkAtom.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int atomInit; /* 0 means stuff below hasn't been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * initialized yet. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable nameTable; /* Maps from names to Atom's. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable atomTable; /* Maps from Atom's back to names. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkCursor.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Font cursorFont; /* Font to use for standard cursors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * None means font not loaded yet. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkGrab.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *grabWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Window in which the pointer is currently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * grabbed, or NULL if none. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *eventualGrabWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Value that grabWinPtr will have once the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * grab event queue (below) has been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * completely emptied. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *buttonWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Window in which first mouse button was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * pressed while grab was in effect, or NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * if no such press in effect. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *serverWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* If no application contains the pointer then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * this is NULL. Otherwise it contains the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * last window for which we've gotten an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Enter or Leave event from the server (i.e.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the last window known to have contained
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the pointer). Doesn't reflect events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * that were synthesized in tkGrab.c. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkGrabEvent *firstGrabEventPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of enter/leave events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * synthesized by grab code. These events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * must be processed in order before any other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * events are processed. NULL means no such
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * events. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkGrabEvent *lastGrabEventPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Last in list of synthesized events, or NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * if list is empty. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int grabFlags; /* Miscellaneous flag values. See definitions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * in tkGrab.c. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkXId.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkIdStack *idStackPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of chunks of free resource
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * identifiers, or NULL if there are no free
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * resources. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XID(*defaultAllocProc) _ANSI_ARGS_((Display *display));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Default resource allocator for display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkIdStack *windowStackPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* First in list of chunks of window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * identifers that can't be reused right
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * now. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int idCleanupScheduled; /* 1 means a call to WindowIdCleanup has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * already been scheduled, 0 means it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * hasn't. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information maintained by tkWindow.c for use later on by tkXId.c:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int destroyCount; /* Number of Tk_DestroyWindow operations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * in progress. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned long lastDestroyRequest;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Id of most recent XDestroyWindow request;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * can re-use ids in windowStackPtr when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * server has seen this request and event
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * queue is empty. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkVisual.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkColormap *cmapPtr; /* First in list of all non-default colormaps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * allocated for this display. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Information used by tkFocus.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_MAJOR_VERSION == 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *focusWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Window that currently has the focus for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * this display, or NULL if none. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *implicitWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* If the focus arrived at a toplevel window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * implicitly via an Enter event (rather
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * than via a FocusIn event), this points
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * to the toplevel window. Otherwise it is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * NULL. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *focusOnMapPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* This points to a toplevel window that is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * supposed to receive the X input focus as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * soon as it is mapped (needed to handle the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * fact that X won't allow the focus on an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * unmapped window). NULL means no delayed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * focus op in progress. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int forceFocus; /* Associated with focusOnMapPtr: non-zero
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * means claim the focus even if some other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * application currently has it. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *implicitWinPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* If the focus arrived at a toplevel window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * implicitly via an Enter event (rather
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * than via a FocusIn event), this points
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * to the toplevel window. Otherwise it is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * NULL. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *focusPtr; /* Points to the window on this display that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * should be receiving keyboard events. When
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * multiple applications on the display have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the focus, this will refer to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * innermost window in the innermost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * application. This information isn't used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * under Unix or Windows, but it's needed on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the Macintosh. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_MAJOR_VERSION == 4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Used by tkColor.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkStressedCmap *stressPtr; /* First in list of colormaps that have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * filled up, so we have to pick an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * approximate color. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Used by tkEvent.c only:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindowEvent *delayedMotionPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Points to a malloc-ed motion event
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * whose processing has been delayed in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the hopes that another motion event
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * will come along right away and we can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * merge the two of them together. NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * means that there is no delayed motion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * event. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Miscellaneous information:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef TK_USE_INPUT_METHODS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XIM inputMethod; /* Input method for this display */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_USE_INPUT_METHODS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_HashTable winTable; /* Maps from X window ids to TkWindow ptrs. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int refCount; /* Reference count of how many Tk applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * are using this display. Used to clean up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the display when we no longer have any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Tk applications using it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_MAJOR_VERSION > 4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} TkDisplay;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_VERSION_NUMBER >= _VERSION(8,1,0) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct TkWindowStruct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Display *display;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkDisplay *dispPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int screenNum;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Visual *visual;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int depth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Window window;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *childList;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *lastChildPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *parentPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindow *nextPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkMainInfo *infoPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *pathName;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Uid nameUid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Uid classUid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XWindowChanges changes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int dirtyChanges;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XSetWindowAttributes atts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned long dirtyAtts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkEventHandler *handlerList;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef TK_USE_INPUT_METHODS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XIC inputContext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* TK_USE_INPUT_METHODS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ClientData *tagPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int nTags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int optionLevel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkSelHandler *selHandlerList;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_GeomMgr *geomMgrPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ClientData geomData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int reqWidth, reqHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int internalBorderWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWinInfo *wmInfoPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkClassProcs *classProcsPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ClientData instanceData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TkWindowPrivate *privatePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int internalBorderRight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int internalBorderTop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int internalBorderBottom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int minReqWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int minReqHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltPs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltPs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -895,7 +895,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((relief == TK_RELIEF_SOLID) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (borderPtr->lightColor == NULL) || (borderPtr->darkColor == NULL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (borderPtr->lightColorPtr == NULL) || (borderPtr->darkColorPtr == NULL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (relief == TK_RELIEF_SOLID) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darkColor.red = darkColor.blue = darkColor.green = 0x00;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lightColor.red = lightColor.blue = lightColor.green = 0x00;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -903,7 +903,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Screen *screenPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lightColor = *borderPtr->bgColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lightColor = *borderPtr->bgColorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ screenPtr = Tk_Screen(tokenPtr->tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (lightColor.pixel == WhitePixelOfScreen(screenPtr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darkColor.red = darkColor.blue = darkColor.green = 0x00;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -914,8 +914,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lightColorPtr = &lightColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darkColorPtr = &darkColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lightColorPtr = borderPtr->lightColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darkColorPtr = borderPtr->darkColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lightColorPtr = borderPtr->lightColorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darkColorPtr = borderPtr->darkColorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -944,7 +944,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ topColor = darkColorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bottomColor = lightColorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- topColor = bottomColor = borderPtr->bgColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ topColor = bottomColor = borderPtr->bgColorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_BackgroundToPostScript(tokenPtr, bottomColor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_RectangleToPostScript(tokenPtr, x, y + height - borderWidth, width,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -984,7 +984,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Setting the pen color as foreground or background only affects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the plot when the colormode option is "monochrome".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Blt_BackgroundToPostScript(tokenPtr, borderPtr->bgColor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Blt_BackgroundToPostScript(tokenPtr, borderPtr->bgColorPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_RectangleToPostScript(tokenPtr, x, y, width, height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Draw3DRectangleToPostScript(tokenPtr, border, x, y, width, height,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ borderWidth, relief);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/bltText.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/bltText.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -903,7 +903,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkBorder *borderPtr = (TkBorder *) tsPtr->border;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *color1, *color2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- color1 = borderPtr->lightColor, color2 = borderPtr->darkColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ color1 = borderPtr->lightColorPtr, color2 = borderPtr->darkColorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tsPtr->state & STATE_EMPHASIS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *hold;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -968,7 +968,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkBorder *borderPtr = (TkBorder *) tsPtr->border;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *color1, *color2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- color1 = borderPtr->lightColor, color2 = borderPtr->darkColor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ color1 = borderPtr->lightColorPtr, color2 = borderPtr->darkColorPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tsPtr->state & STATE_EMPHASIS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XColor *hold;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/generic/tkFrame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/generic/tkFrame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,7 +116,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags; /* Various flags; see below for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * definitions. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Tile tile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} Frame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++} bltFrame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Flag bits for frames:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -143,65 +143,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Tk_ConfigSpec configSpecs[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_BORDER, "-background", "background", "Background",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_BACKGROUND, Tk_Offset(Frame, border),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_BACKGROUND, Tk_Offset(bltFrame, border),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOTH | TK_CONFIG_COLOR_ONLY | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_BORDER, "-background", "background", "Background",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_BG_MONO, Tk_Offset(Frame, border),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_BG_MONO, Tk_Offset(bltFrame, border),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOTH | TK_CONFIG_MONO_ONLY | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_SYNONYM, "-bd", "borderWidth", (char *)NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL, 0, BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_SYNONYM, "-bg", "background", (char *)NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL, 0, BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_BORDERWIDTH, Tk_Offset(Frame, borderWidth), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_BORDERWIDTH, Tk_Offset(bltFrame, borderWidth), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_STRING, "-class", "class", "Class",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_CLASS, Tk_Offset(Frame, className), FRAME},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_CLASS, Tk_Offset(bltFrame, className), FRAME},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_STRING, "-class", "class", "Class",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_TOPLEVEL_CLASS, Tk_Offset(Frame, className), TOPLEVEL},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_TOPLEVEL_CLASS, Tk_Offset(bltFrame, className), TOPLEVEL},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_STRING, "-colormap", "colormap", "Colormap",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_COLORMAP, Tk_Offset(Frame, colormapName),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_COLORMAP, Tk_Offset(bltFrame, colormapName),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOTH | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_BOOLEAN, "-container", "container", "Container",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_CONTAINER, Tk_Offset(Frame, isContainer), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_CONTAINER, Tk_Offset(bltFrame, isContainer), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* TK_MAJOR_VERSION > 4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_ACTIVE_CURSOR, "-cursor", "cursor", "Cursor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_CURSOR, Tk_Offset(Frame, cursor), BOTH | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_CURSOR, Tk_Offset(bltFrame, cursor), BOTH | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_PIXELS, "-height", "height", "Height",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_HEIGHT, Tk_Offset(Frame, height), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_HEIGHT, Tk_Offset(bltFrame, height), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_COLOR, "-highlightbackground", "highlightBackground",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "HighlightBackground", DEF_FRAME_HIGHLIGHT_BG,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tk_Offset(Frame, highlightBgColorPtr), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_Offset(bltFrame, highlightBgColorPtr), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_COLOR, "-highlightcolor", "highlightColor", "HighlightColor",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_HIGHLIGHT, Tk_Offset(Frame, highlightColorPtr), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_HIGHLIGHT, Tk_Offset(bltFrame, highlightColorPtr), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_PIXELS, "-highlightthickness", "highlightThickness",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "HighlightThickness",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_HIGHLIGHT_WIDTH, Tk_Offset(Frame, highlightWidth), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_HIGHLIGHT_WIDTH, Tk_Offset(bltFrame, highlightWidth), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_STRING, "-menu", "menu", "Menu",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_TOPLEVEL_MENU, Tk_Offset(Frame, menuName),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_TOPLEVEL_MENU, Tk_Offset(bltFrame, menuName),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TOPLEVEL | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* TK_MAJOR_VERSION > 4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_RELIEF, "-relief", "relief", "Relief",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_RELIEF, Tk_Offset(Frame, relief), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_RELIEF, Tk_Offset(bltFrame, relief), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_STRING, "-screen", "screen", "Screen",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_TOPLEVEL_SCREEN, Tk_Offset(Frame, screenName),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_TOPLEVEL_SCREEN, Tk_Offset(bltFrame, screenName),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TOPLEVEL | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_STRING, "-takefocus", "takeFocus", "TakeFocus",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_TAKE_FOCUS, Tk_Offset(Frame, takeFocus),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_TAKE_FOCUS, Tk_Offset(bltFrame, takeFocus),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOTH | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_CUSTOM, "-tile", "tile", "Tile",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (char *)NULL, Tk_Offset(Frame, tile), BOTH | TK_CONFIG_NULL_OK,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (char *)NULL, Tk_Offset(bltFrame, tile), BOTH | TK_CONFIG_NULL_OK,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &bltTileOption},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_STRING, "-use", "use", "Use",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_USE, Tk_Offset(Frame, useThis), TOPLEVEL|TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_USE, Tk_Offset(bltFrame, useThis), TOPLEVEL|TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_STRING, "-visual", "visual", "Visual",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_VISUAL, Tk_Offset(Frame, visualName),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_VISUAL, Tk_Offset(bltFrame, visualName),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOTH | TK_CONFIG_NULL_OK},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_PIXELS, "-width", "width", "Width",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEF_FRAME_WIDTH, Tk_Offset(Frame, width), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEF_FRAME_WIDTH, Tk_Offset(bltFrame, width), BOTH},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {TK_CONFIG_END, (char *)NULL, (char *)NULL, (char *)NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (char *)NULL, 0, 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ConfigureFrame _ANSI_ARGS_((Tcl_Interp *interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Frame * framePtr, int argc, char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bltFrame * framePtr, int argc, CONST84 char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DestroyFrame _ANSI_ARGS_((DestroyData *memPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void DisplayFrame _ANSI_ARGS_((ClientData clientData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,27 +219,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void FrameEventProc _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XEvent *eventPtr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int FrameWidgetCmd _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_Interp *interp, int argc, char **argv));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void MapFrame _ANSI_ARGS_((ClientData clientData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Blt_TileChangedProc TileChangedProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static Tcl_CmdProc FrameCmd, ToplevelCmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static Tcl_CmdProc FrameCmd, ToplevelCmd, FrameWidgetCmd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef TILE_MAINWINDOW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int TkCreateFrame _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_Interp *interp, int argc, char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int BltCreateFrame _ANSI_ARGS_((ClientData clientData,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_Interp *interp, int argc, CONST84 char **argv,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int toplevel, char *appName));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTERN void TkSetWindowMenuBar _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *oldMenuName, char *menuName));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTERN Tk_Window TkCreateMainWindow _ANSI_ARGS_((Tcl_Interp * interp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char * screenName, char * baseName));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION > 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TkSetClassProcs Tk_SetClassProcs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,10 +236,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData instanceData));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION > 3 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (TCL_VERSION_NUMBER < _VERSION(8,6,0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN void TkpSetMainMenubar _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char * menuName));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXTERN int TkpUseWindow _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char * string));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTERN void TkpMakeContainer _ANSI_ARGS_((Tk_Window tkwin));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -279,9 +268,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * interpreter. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Current interpreter. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST84 char **argv; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TkCreateFrame(clientData, interp, argc, argv, 0, (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return BltCreateFrame(clientData, interp, argc, argv, 0, (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,9 +279,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * interpreter. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Current interpreter. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST84 char **argv; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TkCreateFrame(clientData, interp, argc, argv, 1, (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return BltCreateFrame(clientData, interp, argc, argv, 1, (char *)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -319,20 +308,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* TILE_MAINWINDOW */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TkCreateFrame(clientData, interp, argc, argv, toplevel, appName)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BltCreateFrame(clientData, interp, argc, argv, toplevel, appName)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Main window associated with interpreter.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * If we're called by Tk_Init to create a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * new application, then this is NULL. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Current interpreter. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST84 char *argv[]; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int toplevel; /* Non-zero means create a toplevel window,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * zero means create a frame. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *appName; /* Should only be non-NULL if clientData is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * NULL: gives the base name to use for the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * new application. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Frame *framePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bltFrame *framePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window new;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *className, *screenName, *visualName, *colormapName, *arg, *useOption;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, c, length, depth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -407,7 +396,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (appName == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- panic("TkCreateFrame didn't get application name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ panic("BltCreateFrame didn't get application name");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new = (Tk_Window)TkCreateMainWindow(interp, screenName, appName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -467,7 +456,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * in the widget record from the special options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- framePtr = Blt_Malloc(sizeof(Frame));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ framePtr = Blt_Malloc(sizeof(bltFrame));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ framePtr->tkwin = new;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ framePtr->display = Tk_Display(new);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ framePtr->interp = interp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -558,9 +547,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Information about frame widget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Current interpreter. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST84 char *argv[]; /* Argument strings. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- register Frame *framePtr = (Frame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register bltFrame *framePtr = (bltFrame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int c, i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -660,7 +649,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DestroyFrame(memPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DestroyData *memPtr; /* Info about frame widget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- register Frame *framePtr = (Frame *) memPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register bltFrame *framePtr = (bltFrame *) memPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_FreeOptions(configSpecs, (char *)framePtr, framePtr->display,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ framePtr->mask);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -689,7 +678,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Blt_Tile tile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Frame *framePtr = (Frame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bltFrame *framePtr = (bltFrame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (framePtr->tkwin != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(framePtr->flags & REDRAW_PENDING)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -723,10 +712,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ConfigureFrame(interp, framePtr, argc, argv, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_Interp *interp; /* Used for error reporting. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- register Frame *framePtr; /* Information about widget; may or may
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register bltFrame *framePtr; /* Information about widget; may or may
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * not already have values for some fields. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc; /* Number of valid entries in argv. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char **argv; /* Arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONST84 char **argv; /* Arguments. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags; /* Flags to pass to Tk_ConfigureWidget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -810,7 +799,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DisplayFrame(clientData)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Information about widget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- register Frame *framePtr = (Frame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register bltFrame *framePtr = (bltFrame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register Tk_Window tkwin = framePtr->tkwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GC gc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -877,7 +866,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Information about window. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register XEvent *eventPtr; /* Information about event. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- register Frame *framePtr = (Frame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register bltFrame *framePtr = (bltFrame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (eventPtr->type == ConfigureNotify)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -964,7 +953,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FrameCmdDeletedProc(clientData)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Pointer to widget record for widget. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Frame *framePtr = (Frame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bltFrame *framePtr = (bltFrame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tk_Window tkwin = framePtr->tkwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (TK_MAJOR_VERSION > 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1010,7 +999,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MapFrame(clientData)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClientData clientData; /* Pointer to frame structure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Frame *framePtr = (Frame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bltFrame *framePtr = (bltFrame *) clientData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Wait for all other background events to be processed before
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1067,9 +1056,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define Tk_InstanceData(tkwin) (((Tk_FakeWin *)(tkwin))->dummy18)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define Tk_MainPtr(tkwin) (((Tk_FakeWin *)(tkwin))->dummy5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tk_MainPtr(tkwin) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Frame *framePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bltFrame *framePtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- framePtr = (Frame *) Tk_InstanceData(tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ framePtr = (bltFrame *) Tk_InstanceData(tkwin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkpMenuNotifyToplevelCreate(framePtr->interp, framePtr->menuName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* TK_MAJOR_VERSION > 4 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -816,6 +816,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${TK_INC_DIR}" != "/usr/include" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INC_SPECS="${INC_SPECS} -I${TK_INC_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INC_SPECS="${INC_SPECS} -I${TK_SRC_DIR}/generic -I${TK_SRC_DIR}/unix"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tcl include files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span></pre><pre style='margin:0'>
</pre>