From 287331b62e1a63ddf1a687ca6f4679cc0ba053ea Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 26 Mar 2012 12:32:05 +0000 Subject: fix scoping of buf (introduced with fix for [Bug 2809525] --- generic/tkColor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/tkColor.c b/generic/tkColor.c index 5866dfd..a5a1136 100644 --- a/generic/tkColor.c +++ b/generic/tkColor.c @@ -820,8 +820,8 @@ TkParseColor(display, map, name, color) CONST char* name; /* String to be parsed */ XColor * color; { + char buf[14]; if (*name == '#') { - char buf[14]; buf[0] = '#'; buf[13] = '\0'; if (!*(++name) || !*(++name) || !*(++name)) { /* Not at least 3 hex digits, so invalid */ -- cgit v0.12 From efdbc3f8c05ecc0ba68102a2701831532943961a Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 26 Mar 2012 21:06:54 +0000 Subject: enable cygwin build in /win directory (using mingw-w64 compiler) --- generic/default.h | 2 +- win/configure | 74 +++++++++++++++++++++++++++++-------------------------- win/tcl.m4 | 30 ++++++++++++---------- 3 files changed, 57 insertions(+), 49 deletions(-) diff --git a/generic/default.h b/generic/default.h index 0f67ebf..dd4f609 100644 --- a/generic/default.h +++ b/generic/default.h @@ -15,7 +15,7 @@ #define _DEFAULT #if defined(__WIN32__) || defined(_WIN32) || \ - defined(__CYGWIN__) || defined(__MINGW32__) + defined(__MINGW32__) # include "tkWinDefault.h" #else # if defined(MAC_OSX_TK) diff --git a/win/configure b/win/configure index 31fe393..7cddb40 100755 --- a/win/configure +++ b/win/configure @@ -1279,18 +1279,22 @@ echo "configure:1262: checking compiler flags" >&5 extra_ldflags="-pipe" if test "$ac_cv_cygwin" = "yes"; then - touch ac$$.c - if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then - case "$extra_cflags" in - *-mwin32*) ;; - *) extra_cflags="-mwin32 $extra_cflags" ;; - esac - case "$extra_ldflags" in - *-mwin32*) ;; - *) extra_ldflags="-mwin32 $extra_ldflags" ;; + case "$do64bit" in + amd64|x64|yes) + CC="x86_64-w64-mingw32-gcc" + LD="x86_64-w64-mingw32-ld" + AR="x86_64-w64-mingw32-ar" + RANLIB="x86_64-w64-mingw32-ranlib" + RC="x86_64-w64-mingw32-windres" + ;; + *) + CC="i686-w64-mingw32-gcc" + LD="i686-w64-mingw32-ld" + AR="i686-w64-mingw32-ar" + RANLIB="i686-w64-mingw32-ranlib" + RC="i686-w64-mingw32-windres" + ;; esac - fi - rm -f ac$$.o ac$$.c fi if test "${SHARED_BUILD}" = "0" ; then @@ -1372,7 +1376,7 @@ echo "configure:1262: checking compiler flags" >&5 ;; *) cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_win_64bit=no else @@ -1633,7 +1637,7 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1637: checking how to run the C preprocessor" >&5 +echo "configure:1641: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1648,13 +1652,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1665,13 +1669,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1682,13 +1686,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1714,17 +1718,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:1718: checking for errno.h" >&5 +echo "configure:1722: checking for errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1754,20 +1758,20 @@ fi if test "${MACHINE}" = "X86" ; then echo $ac_n "checking availability of _strtoi64""... $ac_c" 1>&6 -echo "configure:1758: checking availability of _strtoi64" >&5 +echo "configure:1762: checking availability of _strtoi64" >&5 if eval "test \"`echo '$''{'tcl_have_strtoi64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { _strtoi64(0,0,0) ; return 0; } EOF -if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_have_strtoi64=yes else @@ -1796,7 +1800,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1800: checking for build with symbols" >&5 +echo "configure:1804: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -1857,7 +1861,7 @@ TK_DBGX=${DBGX} echo $ac_n "checking whether to embed manifest""... $ac_c" 1>&6 -echo "configure:1861: checking whether to embed manifest" >&5 +echo "configure:1865: checking whether to embed manifest" >&5 # Check whether --enable-embedded-manifest or --disable-embedded-manifest was given. if test "${enable_embedded_manifest+set}" = set; then enableval="$enable_embedded_manifest" @@ -1867,14 +1871,14 @@ else fi - VC_MANIFEST_EMBED_DLL= - VC_MANIFEST_EMBED_EXE= + VC_MANIFEST_EMBED_DLL= + VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe cat > conftest.$ac_ext <= 1400 @@ -1911,7 +1915,7 @@ rm -f conftest* echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1915: checking the location of tclConfig.sh" >&5 +echo "configure:1919: checking the location of tclConfig.sh" >&5 if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win @@ -1939,7 +1943,7 @@ fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1943: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "configure:1947: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 @@ -1992,14 +1996,14 @@ echo "configure:1943: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6 -echo "configure:1996: checking for tclsh in Tcl build directory" >&5 +echo "configure:2000: checking for tclsh in Tcl build directory" >&5 BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT} echo "$ac_t""$BUILD_TCLSH" 1>&6 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:2003: checking for tclsh" >&5 +echo "configure:2007: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/win/tcl.m4 b/win/tcl.m4 index 82bef11..796ae5f 100644 --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -462,18 +462,22 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ extra_ldflags="-pipe" if test "$ac_cv_cygwin" = "yes"; then - touch ac$$.c - if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then - case "$extra_cflags" in - *-mwin32*) ;; - *) extra_cflags="-mwin32 $extra_cflags" ;; - esac - case "$extra_ldflags" in - *-mwin32*) ;; - *) extra_ldflags="-mwin32 $extra_ldflags" ;; + case "$do64bit" in + amd64|x64|yes) + CC="x86_64-w64-mingw32-gcc" + LD="x86_64-w64-mingw32-ld" + AR="x86_64-w64-mingw32-ar" + RANLIB="x86_64-w64-mingw32-ranlib" + RC="x86_64-w64-mingw32-windres" + ;; + *) + CC="i686-w64-mingw32-gcc" + LD="i686-w64-mingw32-ld" + AR="i686-w64-mingw32-ar" + RANLIB="i686-w64-mingw32-ranlib" + RC="i686-w64-mingw32-windres" + ;; esac - fi - rm -f ac$$.o ac$$.c fi if test "${SHARED_BUILD}" = "0" ; then @@ -918,8 +922,8 @@ AC_DEFUN([SC_EMBED_MANIFEST], [ [ --enable-embedded-manifest embed manifest if possible (default: yes)], [embed_ok=$enableval], [embed_ok=yes]) - VC_MANIFEST_EMBED_DLL= - VC_MANIFEST_EMBED_EXE= + VC_MANIFEST_EMBED_DLL= + VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then -- cgit v0.12 From 0778365664c71cc817ace102db58b34dca459aec Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 29 Mar 2012 07:28:06 +0000 Subject: implementation ready for further field-tests --- unix/configure | 428 +++++++++++++++++++++++++++++++----------------------- unix/tcl.m4 | 39 ++++- win/configure | 433 +++++++++++++++++++++++++++++++++++++++++++------------ win/configure.in | 6 - win/tcl.m4 | 166 ++++++++++++++++++--- 5 files changed, 774 insertions(+), 298 deletions(-) diff --git a/unix/configure b/unix/configure index ac5a7ed..2a30761 100755 --- a/unix/configure +++ b/unix/configure @@ -2339,17 +2339,49 @@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - CYGWIN_*) + CYGWIN_*|MINGW32*) SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" - DL_OBJS="tclLoadDl.o" + DL_OBJS="tclLoadDl.o tclWinError.o" DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" - TCL_NEEDS_EXP_FILE=1 - TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a' + echo $ac_n "checking for Cygwin version of gcc""... $ac_c" 1>&6 +echo "configure:2353: checking for Cygwin version of gcc" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=yes +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 + if test "$ac_cv_cygwin" = "no"; then + { echo "configure: error: ${CC} is not a cygwin compiler." 1>&2; exit 1; } + fi ;; dgux*) SHLIB_CFLAGS="-K PIC" @@ -2369,7 +2401,7 @@ fi DL_OBJS="tclLoadDl.o" DL_LIBS="-lroot" echo $ac_n "checking for inet_ntoa in -lnetwork""... $ac_c" 1>&6 -echo "configure:2373: checking for inet_ntoa in -lnetwork" >&5 +echo "configure:2405: checking for inet_ntoa in -lnetwork" >&5 ac_lib_var=`echo network'_'inet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2377,7 +2409,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnetwork $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2427,7 +2459,7 @@ EOF SHLIB_SUFFIX=".sl" fi echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:2431: checking for shl_load in -ldld" >&5 +echo "configure:2463: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2435,7 +2467,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2512,7 +2544,7 @@ fi HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) SHLIB_SUFFIX=".sl" echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:2516: checking for shl_load in -ldld" >&5 +echo "configure:2548: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2520,7 +2552,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2658,17 +2690,17 @@ fi else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 -echo "configure:2662: checking for dld.h" >&5 +echo "configure:2694: checking for dld.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2700,7 +2732,7 @@ fi fi if test $do64bit = yes; then echo $ac_n "checking if compiler accepts -m64 flag""... $ac_c" 1>&6 -echo "configure:2704: checking if compiler accepts -m64 flag" >&5 +echo "configure:2736: checking if compiler accepts -m64 flag" >&5 if eval "test \"`echo '$''{'tcl_cv_cc_m64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2708,14 +2740,14 @@ else hold_cflags=$CFLAGS CFLAGS="$CFLAGS -m64" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_cc_m64=yes else @@ -2767,17 +2799,17 @@ EOF else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 -echo "configure:2771: checking for dld.h" >&5 +echo "configure:2803: checking for dld.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2846,17 +2878,17 @@ fi # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:2850: checking for dlfcn.h" >&5 +echo "configure:2882: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2884,13 +2916,13 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' fi echo $ac_n "checking for ELF""... $ac_c" 1>&6 -echo "configure:2888: checking for ELF" >&5 +echo "configure:2920: checking for ELF" >&5 if eval "test \"`echo '$''{'tcl_cv_ld_elf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:2973: checking for ELF" >&5 +echo "configure:3005: checking for ELF" >&5 if eval "test \"`echo '$''{'tcl_cv_ld_elf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 case `arch` in ppc) echo $ac_n "checking if compiler accepts -arch ppc64 flag""... $ac_c" 1>&6 -echo "configure:3081: checking if compiler accepts -arch ppc64 flag" >&5 +echo "configure:3113: checking if compiler accepts -arch ppc64 flag" >&5 if eval "test \"`echo '$''{'tcl_cv_cc_arch_ppc64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3085,14 +3117,14 @@ else hold_cflags=$CFLAGS CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_cc_arch_ppc64=yes else @@ -3112,7 +3144,7 @@ echo "$ac_t""$tcl_cv_cc_arch_ppc64" 1>&6 fi;; i386) echo $ac_n "checking if compiler accepts -arch x86_64 flag""... $ac_c" 1>&6 -echo "configure:3116: checking if compiler accepts -arch x86_64 flag" >&5 +echo "configure:3148: checking if compiler accepts -arch x86_64 flag" >&5 if eval "test \"`echo '$''{'tcl_cv_cc_arch_x86_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3120,14 +3152,14 @@ else hold_cflags=$CFLAGS CFLAGS="$CFLAGS -arch x86_64" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_cc_arch_x86_64=yes else @@ -3156,7 +3188,7 @@ echo "$ac_t""$tcl_cv_cc_arch_x86_64" 1>&6 fi SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}' echo $ac_n "checking if ld accepts -single_module flag""... $ac_c" 1>&6 -echo "configure:3160: checking if ld accepts -single_module flag" >&5 +echo "configure:3192: checking if ld accepts -single_module flag" >&5 if eval "test \"`echo '$''{'tcl_cv_ld_single_module'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3164,14 +3196,14 @@ else hold_ldflags=$LDFLAGS LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_ld_single_module=yes else @@ -3197,7 +3229,7 @@ echo "$ac_t""$tcl_cv_ld_single_module" 1>&6 LDFLAGS="$LDFLAGS -prebind" LDFLAGS="$LDFLAGS -headerpad_max_install_names" echo $ac_n "checking if ld accepts -search_paths_first flag""... $ac_c" 1>&6 -echo "configure:3201: checking if ld accepts -search_paths_first flag" >&5 +echo "configure:3233: checking if ld accepts -search_paths_first flag" >&5 if eval "test \"`echo '$''{'tcl_cv_ld_search_paths_first'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3205,14 +3237,14 @@ else hold_ldflags=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_ld_search_paths_first=yes else @@ -3235,7 +3267,7 @@ echo "$ac_t""$tcl_cv_ld_search_paths_first" 1>&6 PLAT_OBJS=\$\(MAC\_OSX_OBJS\) PLAT_SRCS=\$\(MAC\_OSX_SRCS\) echo $ac_n "checking whether to use CoreFoundation""... $ac_c" 1>&6 -echo "configure:3239: checking whether to use CoreFoundation" >&5 +echo "configure:3271: checking whether to use CoreFoundation" >&5 # Check whether --enable-corefoundation or --disable-corefoundation was given. if test "${enable_corefoundation+set}" = set; then enableval="$enable_corefoundation" @@ -3247,7 +3279,7 @@ fi echo "$ac_t""$tcl_corefoundation" 1>&6 if test $tcl_corefoundation = yes; then echo $ac_n "checking for CoreFoundation.framework""... $ac_c" 1>&6 -echo "configure:3251: checking for CoreFoundation.framework" >&5 +echo "configure:3283: checking for CoreFoundation.framework" >&5 if eval "test \"`echo '$''{'tcl_cv_lib_corefoundation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3261,14 +3293,14 @@ else done; fi LIBS="$LIBS -framework CoreFoundation" cat > conftest.$ac_ext < int main() { CFBundleRef b = CFBundleGetMainBundle(); ; return 0; } EOF -if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_lib_corefoundation=yes else @@ -3295,7 +3327,7 @@ EOF fi if test "$fat_32_64" = yes -a $tcl_corefoundation = yes; then echo $ac_n "checking for 64-bit CoreFoundation""... $ac_c" 1>&6 -echo "configure:3299: checking for 64-bit CoreFoundation" >&5 +echo "configure:3331: checking for 64-bit CoreFoundation" >&5 if eval "test \"`echo '$''{'tcl_cv_lib_corefoundation_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3304,14 +3336,14 @@ else eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"' done cat > conftest.$ac_ext < int main() { CFBundleRef b = CFBundleGetMainBundle(); ; return 0; } EOF -if { (eval echo configure:3315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_lib_corefoundation_64=yes else @@ -3640,7 +3672,7 @@ EOF # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers # that don't grok the -Bexport option. Test that it does. echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6 -echo "configure:3644: checking for ld accepts -Bexport flag" >&5 +echo "configure:3676: checking for ld accepts -Bexport flag" >&5 if eval "test \"`echo '$''{'tcl_cv_ld_Bexport'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3648,14 +3680,14 @@ else hold_ldflags=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-Bexport" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_ld_Bexport=yes else @@ -3705,13 +3737,13 @@ echo "$ac_t""$tcl_cv_ld_Bexport" 1>&6 if test "x$DL_OBJS" = "xtclLoadAout.o" ; then echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 -echo "configure:3709: checking sys/exec.h" >&5 +echo "configure:3741: checking sys/exec.h" >&5 if eval "test \"`echo '$''{'tcl_cv_sysexec_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -3729,7 +3761,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_sysexec_h=usable else @@ -3749,13 +3781,13 @@ EOF else echo $ac_n "checking a.out.h""... $ac_c" 1>&6 -echo "configure:3753: checking a.out.h" >&5 +echo "configure:3785: checking a.out.h" >&5 if eval "test \"`echo '$''{'tcl_cv_aout_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -3773,7 +3805,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_aout_h=usable else @@ -3793,13 +3825,13 @@ EOF else echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 -echo "configure:3797: checking sys/exec_aout.h" >&5 +echo "configure:3829: checking sys/exec_aout.h" >&5 if eval "test \"`echo '$''{'tcl_cv_sysexecaout_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -3817,7 +3849,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_sysexecaout_h=usable else @@ -3880,7 +3912,7 @@ fi case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*) ;; + CYGWIN_*|MINGW32_*) ;; IRIX*) ;; NetBSD-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; @@ -3924,6 +3956,46 @@ fi INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))' fi + # See if the compiler supports casting to a union type. + # This is used to stop gcc from printing a compiler + # warning when initializing a union member. + + echo $ac_n "checking for cast to union support""... $ac_c" 1>&6 +echo "configure:3965: checking for cast to union support" >&5 +if eval "test \"`echo '$''{'tcl_cv_cast_to_union'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + tcl_cv_cast_to_union=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + tcl_cv_cast_to_union=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$tcl_cv_cast_to_union" 1>&6 + if test "$tcl_cv_cast_to_union" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_CAST_TO_UNION 1 +EOF + + fi @@ -3958,7 +4030,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:3962: checking for build with symbols" >&5 +echo "configure:4034: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -4019,21 +4091,21 @@ TK_DBGX=${DBGX} echo $ac_n "checking for required early compiler flags""... $ac_c" 1>&6 -echo "configure:4023: checking for required early compiler flags" >&5 +echo "configure:4095: checking for required early compiler flags" >&5 tcl_flags="" if eval "test \"`echo '$''{'tcl_cv_flag__isoc99_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = (char *)strtoll; char *q = (char *)strtoull; ; return 0; } EOF -if { (eval echo configure:4037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__isoc99_source=no else @@ -4041,7 +4113,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -4049,7 +4121,7 @@ int main() { char *p = (char *)strtoll; char *q = (char *)strtoull; ; return 0; } EOF -if { (eval echo configure:4053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__isoc99_source=yes else @@ -4076,14 +4148,14 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct stat64 buf; int i = stat64("/", &buf); ; return 0; } EOF -if { (eval echo configure:4087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile64_source=no else @@ -4091,7 +4163,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -4099,7 +4171,7 @@ int main() { struct stat64 buf; int i = stat64("/", &buf); ; return 0; } EOF -if { (eval echo configure:4103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile64_source=yes else @@ -4126,14 +4198,14 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = (char *)open64; ; return 0; } EOF -if { (eval echo configure:4137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile_source64=no else @@ -4141,7 +4213,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -4149,7 +4221,7 @@ int main() { char *p = (char *)open64; ; return 0; } EOF -if { (eval echo configure:4153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile_source64=yes else @@ -4180,7 +4252,7 @@ EOF echo $ac_n "checking for 64-bit integer type""... $ac_c" 1>&6 -echo "configure:4184: checking for 64-bit integer type" >&5 +echo "configure:4256: checking for 64-bit integer type" >&5 if eval "test \"`echo '$''{'tcl_cv_type_64bit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4188,14 +4260,14 @@ else tcl_cv_type_64bit=none # See if the compiler knows natively about __int64 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_type_64bit=__int64 else @@ -4209,7 +4281,7 @@ rm -f conftest* # type that is our current guess for a 64-bit type inside this check # program, so it should be modified only carefully... cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_64bit=${tcl_type_64bit} else @@ -4243,13 +4315,13 @@ EOF # Now check for auxiliary declarations echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6 -echo "configure:4247: checking for struct dirent64" >&5 +echo "configure:4319: checking for struct dirent64" >&5 if eval "test \"`echo '$''{'tcl_cv_struct_dirent64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4257,7 +4329,7 @@ int main() { struct dirent64 p; ; return 0; } EOF -if { (eval echo configure:4261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_struct_dirent64=yes else @@ -4278,13 +4350,13 @@ EOF fi echo $ac_n "checking for struct stat64""... $ac_c" 1>&6 -echo "configure:4282: checking for struct stat64" >&5 +echo "configure:4354: checking for struct stat64" >&5 if eval "test \"`echo '$''{'tcl_cv_struct_stat64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -4292,7 +4364,7 @@ struct stat64 p; ; return 0; } EOF -if { (eval echo configure:4296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_struct_stat64=yes else @@ -4315,12 +4387,12 @@ EOF for ac_func in open64 lseek64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4319: checking for $ac_func" >&5 +echo "configure:4391: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4368,13 +4440,13 @@ fi done echo $ac_n "checking for off64_t""... $ac_c" 1>&6 -echo "configure:4372: checking for off64_t" >&5 +echo "configure:4444: checking for off64_t" >&5 if eval "test \"`echo '$''{'tcl_cv_type_off64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -4382,7 +4454,7 @@ off64_t offset; ; return 0; } EOF -if { (eval echo configure:4386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_off64_t=yes else @@ -4413,14 +4485,14 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4417: checking whether byte ordering is bigendian" >&5 +echo "configure:4489: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4431,11 +4503,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4446,7 +4518,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4466,7 +4538,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -4531,20 +4603,20 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for fd_set in sys/types""... $ac_c" 1>&6 -echo "configure:4535: checking for fd_set in sys/types" >&5 +echo "configure:4607: checking for fd_set in sys/types" >&5 if eval "test \"`echo '$''{'tcl_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:4548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_fd_set=yes else @@ -4560,13 +4632,13 @@ echo "$ac_t""$tcl_cv_type_fd_set" 1>&6 tk_ok=$tcl_cv_type_fd_set if test $tk_ok = no; then echo $ac_n "checking for fd_mask in sys/select""... $ac_c" 1>&6 -echo "configure:4564: checking for fd_mask in sys/select" >&5 +echo "configure:4636: checking for fd_mask in sys/select" >&5 if eval "test \"`echo '$''{'tcl_cv_grep_fd_mask'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -4606,17 +4678,17 @@ for ac_hdr in sys/time.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4610: checking for $ac_hdr" >&5 +echo "configure:4682: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4643,12 +4715,12 @@ fi done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4647: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4719: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4657,7 +4729,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4687,12 +4759,12 @@ fi echo $ac_n "checking for strtod""... $ac_c" 1>&6 -echo "configure:4691: checking for strtod" >&5 +echo "configure:4763: checking for strtod" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtod=yes" else @@ -4737,7 +4809,7 @@ fi if test "$tcl_strtod" = 1; then echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6 -echo "configure:4741: checking for Solaris2.4/Tru64 strtod bugs" >&5 +echo "configure:4813: checking for Solaris2.4/Tru64 strtod bugs" >&5 if eval "test \"`echo '$''{'tcl_cv_strtod_buggy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4746,7 +4818,7 @@ else tcl_cv_strtod_buggy=buggy else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_strtod_buggy=ok else @@ -4800,12 +4872,12 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4804: checking for ANSI C header files" >&5 +echo "configure:4876: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4813,7 +4885,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4830,7 +4902,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4848,7 +4920,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4869,7 +4941,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4880,7 +4952,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4904,12 +4976,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4908: checking for mode_t" >&5 +echo "configure:4980: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4937,12 +5009,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4941: checking for pid_t" >&5 +echo "configure:5013: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4970,12 +5042,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4974: checking for size_t" >&5 +echo "configure:5046: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5003,12 +5075,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5007: checking for uid_t in sys/types.h" >&5 +echo "configure:5079: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -5042,20 +5114,20 @@ fi #------------------------------------------- echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6 -echo "configure:5046: checking pw_gecos in struct pwd" >&5 +echo "configure:5118: checking pw_gecos in struct pwd" >&5 if eval "test \"`echo '$''{'tcl_cv_pwd_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct passwd pwd; pwd.pw_gecos; ; return 0; } EOF -if { (eval echo configure:5059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_pwd_pw_gecos=yes else @@ -5081,7 +5153,7 @@ fi if test "`uname -s`" = "Darwin" ; then echo $ac_n "checking whether to use Aqua""... $ac_c" 1>&6 -echo "configure:5085: checking whether to use Aqua" >&5 +echo "configure:5157: checking whether to use Aqua" >&5 # Check whether --enable-aqua or --disable-aqua was given. if test "${enable_aqua+set}" = set; then enableval="$enable_aqua" @@ -5108,7 +5180,7 @@ fi if test "$fat_32_64" = yes; then if test $tk_aqua = no; then echo $ac_n "checking for 64-bit X11""... $ac_c" 1>&6 -echo "configure:5112: checking for 64-bit X11" >&5 +echo "configure:5184: checking for 64-bit X11" >&5 if eval "test \"`echo '$''{'tcl_cv_lib_x11_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5119,14 +5191,14 @@ else CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include" LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11" cat > conftest.$ac_ext < int main() { XrmInitialize(); ; return 0; } EOF -if { (eval echo configure:5130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_lib_x11_64=yes else @@ -5186,7 +5258,7 @@ else # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5190: checking for X" >&5 +echo "configure:5262: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5248,12 +5320,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5322,14 +5394,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5419,12 +5491,12 @@ fi if test "$no_x" = ""; then if test "$x_includes" = ""; then cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -5444,15 +5516,15 @@ rm -f conftest* fi if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then echo $ac_n "checking for X11 header files""... $ac_c" 1>&6 -echo "configure:5448: checking for X11 header files" >&5 +echo "configure:5520: checking for X11 header files" >&5 found_xincludes="no" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5488,7 +5560,7 @@ rm -f conftest* if test "$no_x" = yes; then echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6 -echo "configure:5492: checking for X11 libraries" >&5 +echo "configure:5564: checking for X11 libraries" >&5 XLIBSW=nope dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" for i in $dirs ; do @@ -5508,7 +5580,7 @@ echo "configure:5492: checking for X11 libraries" >&5 fi if test "$XLIBSW" = nope ; then echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6 -echo "configure:5512: checking for XCreateWindow in -lXwindow" >&5 +echo "configure:5584: checking for XCreateWindow in -lXwindow" >&5 ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5516,7 +5588,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXwindow $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5604,7 +5676,7 @@ eval "LD_SEARCH_FLAGS=\"$TCL_LD_SEARCH_FLAGS\"" if test $tk_aqua = no; then echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:5608: checking for main in -lXbsd" >&5 +echo "configure:5680: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5612,14 +5684,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lXbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5643,12 +5715,12 @@ fi tk_checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5647: checking for connect" >&5 +echo "configure:5719: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5693,7 +5765,7 @@ fi if test "$tk_checkSocket" = 1; then echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:5697: checking for main in -lsocket" >&5 +echo "configure:5769: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5701,14 +5773,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5734,12 +5806,12 @@ if test "$tk_checkBoth" = 1; then tk_oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:5738: checking for accept" >&5 +echo "configure:5810: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -5784,12 +5856,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5788: checking for gethostbyname" >&5 +echo "configure:5860: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5830,7 +5902,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5834: checking for main in -lnsl" >&5 +echo "configure:5906: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5838,14 +5910,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5881,13 +5953,13 @@ fi if test -d /usr/include/mit -a $tk_aqua = no; then echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6 -echo "configure:5885: checking MIT X libraries" >&5 +echo "configure:5957: checking MIT X libraries" >&5 tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS -I/usr/include/mit" tk_oldLibs=$LIBS LIBS="$LIBS -lX11-mit" cat > conftest.$ac_ext < @@ -5898,7 +5970,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -5922,14 +5994,14 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:5926: checking whether char is unsigned" >&5 +echo "configure:5998: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -6022,7 +6094,7 @@ if test "`uname -s`" = "Darwin" ; then if test "`uname -s`" = "Darwin" ; then echo $ac_n "checking how to package libraries""... $ac_c" 1>&6 -echo "configure:6026: checking how to package libraries" >&5 +echo "configure:6098: checking how to package libraries" >&5 # Check whether --enable-framework or --disable-framework was given. if test "${enable_framework+set}" = set; then enableval="$enable_framework" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 0d5d698..8ff420a 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1203,17 +1203,28 @@ dnl AC_CHECK_TOOL(AR, ar) CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - CYGWIN_*) + CYGWIN_*|MINGW32*) SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" - DL_OBJS="tclLoadDl.o" + DL_OBJS="tclLoadDl.o tclWinError.o" DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" - TCL_NEEDS_EXP_FILE=1 - TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$[@].a' + AC_CACHE_CHECK(for Cygwin version of gcc, + ac_cv_cygwin, + AC_TRY_COMPILE([ + #ifdef __CYGWIN__ + #error cygwin + #endif + ], [], + ac_cv_cygwin=no, + ac_cv_cygwin=yes) + ) + if test "$ac_cv_cygwin" = "no"; then + AC_MSG_ERROR([${CC} is not a cygwin compiler.]) + fi ;; dgux*) SHLIB_CFLAGS="-K PIC" @@ -2168,7 +2179,7 @@ dnl # preprocessing tests use only CPPFLAGS. case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*) ;; + CYGWIN_*|MINGW32_*) ;; IRIX*) ;; NetBSD-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; @@ -2212,6 +2223,24 @@ dnl # preprocessing tests use only CPPFLAGS. INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))' fi + # See if the compiler supports casting to a union type. + # This is used to stop gcc from printing a compiler + # warning when initializing a union member. + + AC_CACHE_CHECK(for cast to union support, + tcl_cv_cast_to_union, + AC_TRY_COMPILE([], + [ + union foo { int i; double d; }; + union foo f = (union foo) (int) 0; + ], + tcl_cv_cast_to_union=yes, + tcl_cv_cast_to_union=no) + ) + if test "$tcl_cv_cast_to_union" = "yes"; then + AC_DEFINE(HAVE_CAST_TO_UNION, 1, + [Defined when compiler supports casting to union type.]) + fi AC_SUBST(DL_LIBS) diff --git a/win/configure b/win/configure index 31fe393..36e1e57 100755 --- a/win/configure +++ b/win/configure @@ -934,16 +934,40 @@ fi #-------------------------------------------------------------------- -# Perform additinal compiler tests. +# Determines the correct binary file extension (.o, .obj, .exe etc.) #-------------------------------------------------------------------- +echo $ac_n "checking for object suffix""... $ac_c" 1>&6 +echo "configure:942: checking for object suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + rm -f conftest* +echo 'int i = 1;' > conftest.$ac_ext +if { (eval echo configure:948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + for ac_file in conftest.*; do + case $ac_file in + *.c) ;; + *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; + esac + done +else + { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_objext" 1>&6 +OBJEXT=$ac_cv_objext +ac_objext=$ac_cv_objext + echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:942: checking for Cygwin environment" >&5 +echo "configure:966: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -970,49 +994,20 @@ fi echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes - -#-------------------------------------------------------------------- -# Determines the correct binary file extension (.o, .obj, .exe etc.) -#-------------------------------------------------------------------- - -echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:980: checking for object suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftest* -echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; - esac - done -else - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_objext" 1>&6 -OBJEXT=$ac_cv_objext -ac_objext=$ac_cv_objext - echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1004: checking for mingw32 environment" >&5 +echo "configure:999: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1031,7 +1026,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1035: checking for executable suffix" >&5 +echo "configure:1030: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1041,7 +1036,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1068,7 +1063,7 @@ ac_exeext=$EXEEXT echo $ac_n "checking for building with threads""... $ac_c" 1>&6 -echo "configure:1072: checking for building with threads" >&5 +echo "configure:1067: checking for building with threads" >&5 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" @@ -1105,7 +1100,7 @@ EOF echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 -echo "configure:1109: checking how to build libraries" >&5 +echo "configure:1104: checking how to build libraries" >&5 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -1146,7 +1141,7 @@ EOF # Step 0: Enable 64 bit support? echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6 -echo "configure:1150: checking if 64bit support is requested" >&5 +echo "configure:1145: checking if 64bit support is requested" >&5 # Check whether --enable-64bit or --disable-64bit was given. if test "${enable_64bit+set}" = set; then enableval="$enable_64bit" @@ -1160,7 +1155,7 @@ fi # Cross-compiling options for Windows/CE builds echo $ac_n "checking if Windows/CE build is requested""... $ac_c" 1>&6 -echo "configure:1164: checking if Windows/CE build is requested" >&5 +echo "configure:1159: checking if Windows/CE build is requested" >&5 # Check whether --enable-wince or --disable-wince was given. if test "${enable_wince+set}" = set; then enableval="$enable_wince" @@ -1172,7 +1167,7 @@ fi echo "$ac_t""$doWince" 1>&6 echo $ac_n "checking for Windows/CE celib directory""... $ac_c" 1>&6 -echo "configure:1176: checking for Windows/CE celib directory" >&5 +echo "configure:1171: checking for Windows/CE celib directory" >&5 # Check whether --with-celib or --without-celib was given. if test "${with_celib+set}" = set; then withval="$with_celib" @@ -1189,7 +1184,7 @@ fi # Extract the first word of "cygpath", so it can be a program name with args. set dummy cygpath; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1193: checking for $ac_word" >&5 +echo "configure:1188: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CYGPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1223,6 +1218,57 @@ fi # which requires x86|amd64|ia64. MACHINE="X86" + echo $ac_n "checking for Cygwin version of gcc""... $ac_c" 1>&6 +echo "configure:1223: checking for Cygwin version of gcc" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=yes +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 + + if test "$ac_cv_cygwin" = "yes"; then + case "$do64bit" in + amd64|x64|yes) + CC="x86_64-w64-mingw32-gcc" + LD="x86_64-w64-mingw32-ld" + AR="x86_64-w64-mingw32-ar" + RANLIB="x86_64-w64-mingw32-ranlib" + RC="x86_64-w64-mingw32-windres" + ;; + *) + CC="i686-w64-mingw32-gcc" + LD="i686-w64-mingw32-ld" + AR="i686-w64-mingw32-ar" + RANLIB="i686-w64-mingw32-ranlib" + RC="i686-w64-mingw32-windres" + ;; + esac + fi + # Check for a bug in gcc's windres that causes the # compile to fail when a Windows native path is # passed into windres. The mingw toolchain requires @@ -1237,9 +1283,9 @@ fi echo "END" >> $conftest echo $ac_n "checking for Windows native path bug in windres""... $ac_c" 1>&6 -echo "configure:1241: checking for Windows native path bug in windres" >&5 +echo "configure:1287: checking for Windows native path bug in windres" >&5 cyg_conftest=`$CYGPATH $conftest` - if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then + if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then echo "$ac_t""no" 1>&6 else echo "$ac_t""yes" 1>&6 @@ -1249,7 +1295,7 @@ echo "configure:1241: checking for Windows native path bug in windres" >&5 cyg_conftest= fi - if test "$CYGPATH" = "echo" || test "$ac_cv_cygwin" = "yes"; then + if test "$CYGPATH" = "echo"; then DEPARG='"$<"' else DEPARG='"$(shell $(CYGPATH) $<)"' @@ -1257,8 +1303,45 @@ echo "configure:1241: checking for Windows native path bug in windres" >&5 # set various compiler flags depending on whether we are using gcc or cl + if test "${GCC}" = "yes" ; then + echo $ac_n "checking for mingw32 version of gcc""... $ac_c" 1>&6 +echo "configure:1309: checking for mingw32 version of gcc" >&5 +if eval "test \"`echo '$''{'ac_cv_win32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_win32=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_win32=yes +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_win32" 1>&6 + if test "$ac_cv_win32" != "yes"; then + { echo "configure: error: ${CC} cannot produce win32 executables." 1>&2; exit 1; } + fi + fi + echo $ac_n "checking compiler flags""... $ac_c" 1>&6 -echo "configure:1262: checking compiler flags" >&5 +echo "configure:1345: checking compiler flags" >&5 if test "${GCC}" = "yes" ; then SHLIB_LD="" SHLIB_LD_LIBS="" @@ -1278,21 +1361,6 @@ echo "configure:1262: checking compiler flags" >&5 extra_cflags="-pipe" extra_ldflags="-pipe" - if test "$ac_cv_cygwin" = "yes"; then - touch ac$$.c - if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then - case "$extra_cflags" in - *-mwin32*) ;; - *) extra_cflags="-mwin32 $extra_cflags" ;; - esac - case "$extra_ldflags" in - *-mwin32*) ;; - *) extra_ldflags="-mwin32 $extra_ldflags" ;; - esac - fi - rm -f ac$$.o ac$$.c - fi - if test "${SHARED_BUILD}" = "0" ; then # static echo "$ac_t""using static flags" 1>&6 @@ -1372,18 +1440,18 @@ echo "configure:1262: checking compiler flags" >&5 ;; *) cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_win_64bit=no else @@ -1621,6 +1689,193 @@ EOF fi fi + if test "${GCC}" = "yes" ; then + echo $ac_n "checking for SEH support in compiler""... $ac_c" 1>&6 +echo "configure:1695: checking for SEH support in compiler" >&5 +if eval "test \"`echo '$''{'tcl_cv_seh'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + tcl_cv_seh=no +else + cat > conftest.$ac_ext < + #undef WIN32_LEAN_AND_MEAN + + int main(int argc, char** argv) { + int a, b = 0; + __try { + a = 666 / b; + } + __except (EXCEPTION_EXECUTE_HANDLER) { + return 0; + } + return 1; + } + +EOF +if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + tcl_cv_seh=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + tcl_cv_seh=no +fi +rm -fr conftest* +fi + + +fi + +echo "$ac_t""$tcl_cv_seh" 1>&6 + if test "$tcl_cv_seh" = "no" ; then + cat >> confdefs.h <<\EOF +#define HAVE_NO_SEH 1 +EOF + + fi + + # + # Check to see if the excpt.h include file provided contains the + # definition for EXCEPTION_DISPOSITION; if not, which is the case + # with Cygwin's version as of 2002-04-10, define it to be int, + # sufficient for getting the current code to work. + # + echo $ac_n "checking for EXCEPTION_DISPOSITION support in include files""... $ac_c" 1>&6 +echo "configure:1752: checking for EXCEPTION_DISPOSITION support in include files" >&5 +if eval "test \"`echo '$''{'tcl_cv_eh_disposition'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +# undef WIN32_LEAN_AND_MEAN + +int main() { + + EXCEPTION_DISPOSITION x; + +; return 0; } +EOF +if { (eval echo configure:1770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + tcl_cv_eh_disposition=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + tcl_cv_eh_disposition=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$tcl_cv_eh_disposition" 1>&6 + if test "$tcl_cv_eh_disposition" = "no" ; then + cat >> confdefs.h <<\EOF +#define EXCEPTION_DISPOSITION int +EOF + + fi + + # Check to see if winnt.h defines CHAR, SHORT, and LONG + # even if VOID has already been #defined. The win32api + # used by mingw and cygwin is known to do this. + + echo $ac_n "checking for winnt.h that ignores VOID define""... $ac_c" 1>&6 +echo "configure:1796: checking for winnt.h that ignores VOID define" >&5 +if eval "test \"`echo '$''{'tcl_cv_winnt_ignore_void'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < + #undef WIN32_LEAN_AND_MEAN + +int main() { + + CHAR c; + SHORT s; + LONG l; + +; return 0; } +EOF +if { (eval echo configure:1817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + tcl_cv_winnt_ignore_void=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + tcl_cv_winnt_ignore_void=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$tcl_cv_winnt_ignore_void" 1>&6 + if test "$tcl_cv_winnt_ignore_void" = "yes" ; then + cat >> confdefs.h <<\EOF +#define HAVE_WINNT_IGNORE_VOID 1 +EOF + + fi + + # See if the compiler supports casting to a union type. + # This is used to stop gcc from printing a compiler + # warning when initializing a union member. + + echo $ac_n "checking for cast to union support""... $ac_c" 1>&6 +echo "configure:1843: checking for cast to union support" >&5 +if eval "test \"`echo '$''{'tcl_cv_cast_to_union'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + tcl_cv_cast_to_union=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + tcl_cv_cast_to_union=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$tcl_cv_cast_to_union" 1>&6 + if test "$tcl_cv_cast_to_union" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_CAST_TO_UNION 1 +EOF + + fi + fi + # DL_LIBS is empty, but then we match the Unix version @@ -1633,7 +1888,7 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1637: checking how to run the C preprocessor" >&5 +echo "configure:1892: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1648,13 +1903,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1665,13 +1920,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1682,13 +1937,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1714,17 +1969,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:1718: checking for errno.h" >&5 +echo "configure:1973: checking for errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1754,20 +2009,20 @@ fi if test "${MACHINE}" = "X86" ; then echo $ac_n "checking availability of _strtoi64""... $ac_c" 1>&6 -echo "configure:1758: checking availability of _strtoi64" >&5 +echo "configure:2013: checking availability of _strtoi64" >&5 if eval "test \"`echo '$''{'tcl_have_strtoi64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { _strtoi64(0,0,0) ; return 0; } EOF -if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_have_strtoi64=yes else @@ -1796,7 +2051,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1800: checking for build with symbols" >&5 +echo "configure:2055: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -1857,7 +2112,7 @@ TK_DBGX=${DBGX} echo $ac_n "checking whether to embed manifest""... $ac_c" 1>&6 -echo "configure:1861: checking whether to embed manifest" >&5 +echo "configure:2116: checking whether to embed manifest" >&5 # Check whether --enable-embedded-manifest or --disable-embedded-manifest was given. if test "${enable_embedded_manifest+set}" = set; then enableval="$enable_embedded_manifest" @@ -1867,14 +2122,14 @@ else fi - VC_MANIFEST_EMBED_DLL= - VC_MANIFEST_EMBED_EXE= + VC_MANIFEST_EMBED_DLL= + VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe cat > conftest.$ac_ext <= 1400 @@ -1911,7 +2166,7 @@ rm -f conftest* echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1915: checking the location of tclConfig.sh" >&5 +echo "configure:2170: checking the location of tclConfig.sh" >&5 if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win @@ -1939,7 +2194,7 @@ fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1943: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "configure:2198: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 @@ -1992,14 +2247,14 @@ echo "configure:1943: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6 -echo "configure:1996: checking for tclsh in Tcl build directory" >&5 +echo "configure:2251: checking for tclsh in Tcl build directory" >&5 BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT} echo "$ac_t""$BUILD_TCLSH" 1>&6 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:2003: checking for tclsh" >&5 +echo "configure:2258: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/win/configure.in b/win/configure.in index ffad2c0..ff9e2cc 100644 --- a/win/configure.in +++ b/win/configure.in @@ -70,12 +70,6 @@ fi AC_PROG_MAKE_SET #-------------------------------------------------------------------- -# Perform additinal compiler tests. -#-------------------------------------------------------------------- - -AC_CYGWIN - -#-------------------------------------------------------------------- # Determines the correct binary file extension (.o, .obj, .exe etc.) #-------------------------------------------------------------------- diff --git a/win/tcl.m4 b/win/tcl.m4 index 82bef11..5c65750 100644 --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -408,6 +408,36 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # which requires x86|amd64|ia64. MACHINE="X86" + AC_CACHE_CHECK(for Cygwin version of gcc, + ac_cv_cygwin, + AC_TRY_COMPILE([ + #ifdef __CYGWIN__ + #error cygwin + #endif + ], [], + ac_cv_cygwin=no, + ac_cv_cygwin=yes) + ) + + if test "$ac_cv_cygwin" = "yes"; then + case "$do64bit" in + amd64|x64|yes) + CC="x86_64-w64-mingw32-gcc" + LD="x86_64-w64-mingw32-ld" + AR="x86_64-w64-mingw32-ar" + RANLIB="x86_64-w64-mingw32-ranlib" + RC="x86_64-w64-mingw32-windres" + ;; + *) + CC="i686-w64-mingw32-gcc" + LD="i686-w64-mingw32-ld" + AR="i686-w64-mingw32-ar" + RANLIB="i686-w64-mingw32-ranlib" + RC="i686-w64-mingw32-windres" + ;; + esac + fi + # Check for a bug in gcc's windres that causes the # compile to fail when a Windows native path is # passed into windres. The mingw toolchain requires @@ -433,7 +463,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ cyg_conftest= fi - if test "$CYGPATH" = "echo" || test "$ac_cv_cygwin" = "yes"; then + if test "$CYGPATH" = "echo"; then DEPARG='"$<"' else DEPARG='"$(shell $(CYGPATH) $<)"' @@ -441,6 +471,22 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # set various compiler flags depending on whether we are using gcc or cl + if test "${GCC}" = "yes" ; then + AC_CACHE_CHECK(for mingw32 version of gcc, + ac_cv_win32, + AC_TRY_COMPILE([ + #ifdef __WIN32__ + #error win32 + #endif + ], [], + ac_cv_win32=no, + ac_cv_win32=yes) + ) + if test "$ac_cv_win32" != "yes"; then + AC_MSG_ERROR([${CC} cannot produce win32 executables.]) + fi + fi + AC_MSG_CHECKING([compiler flags]) if test "${GCC}" = "yes" ; then SHLIB_LD="" @@ -461,21 +507,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ extra_cflags="-pipe" extra_ldflags="-pipe" - if test "$ac_cv_cygwin" = "yes"; then - touch ac$$.c - if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then - case "$extra_cflags" in - *-mwin32*) ;; - *) extra_cflags="-mwin32 $extra_cflags" ;; - esac - case "$extra_ldflags" in - *-mwin32*) ;; - *) extra_ldflags="-mwin32 $extra_ldflags" ;; - esac - fi - rm -f ac$$.o ac$$.c - fi - if test "${SHARED_BUILD}" = "0" ; then # static AC_MSG_RESULT([using static flags]) @@ -555,9 +586,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ;; *) AC_TRY_COMPILE([ - #ifdef _WIN64 + #ifdef _WIN64 #error 64-bit - #endif + #endif ], [], tcl_win_64bit=no, tcl_win_64bit=yes @@ -780,6 +811,101 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ fi fi + if test "${GCC}" = "yes" ; then + AC_CACHE_CHECK(for SEH support in compiler, + tcl_cv_seh, + AC_TRY_RUN([ + #define WIN32_LEAN_AND_MEAN + #include + #undef WIN32_LEAN_AND_MEAN + + int main(int argc, char** argv) { + int a, b = 0; + __try { + a = 666 / b; + } + __except (EXCEPTION_EXECUTE_HANDLER) { + return 0; + } + return 1; + } + ], + tcl_cv_seh=yes, + tcl_cv_seh=no, + tcl_cv_seh=no) + ) + if test "$tcl_cv_seh" = "no" ; then + AC_DEFINE(HAVE_NO_SEH, 1, + [Defined when mingw does not support SEH]) + fi + + # + # Check to see if the excpt.h include file provided contains the + # definition for EXCEPTION_DISPOSITION; if not, which is the case + # with Cygwin's version as of 2002-04-10, define it to be int, + # sufficient for getting the current code to work. + # + AC_CACHE_CHECK(for EXCEPTION_DISPOSITION support in include files, + tcl_cv_eh_disposition, + AC_TRY_COMPILE([ +# define WIN32_LEAN_AND_MEAN +# include +# undef WIN32_LEAN_AND_MEAN + ],[ + EXCEPTION_DISPOSITION x; + ], + tcl_cv_eh_disposition=yes, + tcl_cv_eh_disposition=no) + ) + if test "$tcl_cv_eh_disposition" = "no" ; then + AC_DEFINE(EXCEPTION_DISPOSITION, int, + [Defined when cygwin/mingw does not support EXCEPTION DISPOSITION]) + fi + + # Check to see if winnt.h defines CHAR, SHORT, and LONG + # even if VOID has already been #defined. The win32api + # used by mingw and cygwin is known to do this. + + AC_CACHE_CHECK(for winnt.h that ignores VOID define, + tcl_cv_winnt_ignore_void, + AC_TRY_COMPILE([ + #define VOID void + #define WIN32_LEAN_AND_MEAN + #include + #undef WIN32_LEAN_AND_MEAN + ], [ + CHAR c; + SHORT s; + LONG l; + ], + tcl_cv_winnt_ignore_void=yes, + tcl_cv_winnt_ignore_void=no) + ) + if test "$tcl_cv_winnt_ignore_void" = "yes" ; then + AC_DEFINE(HAVE_WINNT_IGNORE_VOID, 1, + [Defined when cygwin/mingw ignores VOID define in winnt.h]) + fi + + # See if the compiler supports casting to a union type. + # This is used to stop gcc from printing a compiler + # warning when initializing a union member. + + AC_CACHE_CHECK(for cast to union support, + tcl_cv_cast_to_union, + AC_TRY_COMPILE([], + [ + union foo { int i; double d; }; + union foo f = (union foo) (int) 0; + ], + tcl_cv_cast_to_union=yes, + tcl_cv_cast_to_union=no) + ) + if test "$tcl_cv_cast_to_union" = "yes"; then + AC_DEFINE(HAVE_CAST_TO_UNION, 1, + [Defined when compiler supports casting to union type.]) + fi + fi + # DL_LIBS is empty, but then we match the Unix version AC_SUBST(DL_LIBS) AC_SUBST(CFLAGS_DEBUG) @@ -918,8 +1044,8 @@ AC_DEFUN([SC_EMBED_MANIFEST], [ [ --enable-embedded-manifest embed manifest if possible (default: yes)], [embed_ok=$enableval], [embed_ok=yes]) - VC_MANIFEST_EMBED_DLL= - VC_MANIFEST_EMBED_EXE= + VC_MANIFEST_EMBED_DLL= + VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then -- cgit v0.12 From 49df110769eec89b42d4f354d37bc4762b2d07de Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 29 Mar 2012 22:37:16 +0000 Subject: Only check for cygwin with $GCC --- win/configure | 95 ++++++++++++++++++++++++++++++----------------------------- win/tcl.m4 | 9 ++++-- 2 files changed, 55 insertions(+), 49 deletions(-) diff --git a/win/configure b/win/configure index 27ca399..89ed05d 100755 --- a/win/configure +++ b/win/configure @@ -1218,13 +1218,15 @@ fi # which requires x86|amd64|ia64. MACHINE="X86" - echo $ac_n "checking for cross-compile version of gcc""... $ac_c" 1>&6 -echo "configure:1223: checking for cross-compile version of gcc" >&5 + if test "$GCC" = "yes"; then + + echo $ac_n "checking for cross-compile version of gcc""... $ac_c" 1>&6 +echo "configure:1225: checking for cross-compile version of gcc" >&5 if eval "test \"`echo '$''{'ac_cv_cross'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cross=yes else @@ -1245,12 +1247,12 @@ else ac_cv_cross=no fi rm -f conftest* - + fi echo "$ac_t""$ac_cv_cross" 1>&6 - if test "$ac_cv_cross" = "yes"; then + if test "$ac_cv_cross" = "yes"; then case "$do64bit" in amd64|x64|yes) CC="x86_64-w64-mingw32-gcc" @@ -1267,6 +1269,7 @@ echo "$ac_t""$ac_cv_cross" 1>&6 RC="i686-w64-mingw32-windres" ;; esac + fi fi # Check for a bug in gcc's windres that causes the @@ -1283,9 +1286,9 @@ echo "$ac_t""$ac_cv_cross" 1>&6 echo "END" >> $conftest echo $ac_n "checking for Windows native path bug in windres""... $ac_c" 1>&6 -echo "configure:1287: checking for Windows native path bug in windres" >&5 +echo "configure:1290: checking for Windows native path bug in windres" >&5 cyg_conftest=`$CYGPATH $conftest` - if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then + if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then echo "$ac_t""no" 1>&6 else echo "$ac_t""yes" 1>&6 @@ -1305,12 +1308,12 @@ echo "configure:1287: checking for Windows native path bug in windres" >&5 if test "${GCC}" = "yes" ; then echo $ac_n "checking for mingw32 version of gcc""... $ac_c" 1>&6 -echo "configure:1309: checking for mingw32 version of gcc" >&5 +echo "configure:1312: checking for mingw32 version of gcc" >&5 if eval "test \"`echo '$''{'ac_cv_win32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_win32=no else @@ -1341,7 +1344,7 @@ echo "$ac_t""$ac_cv_win32" 1>&6 fi echo $ac_n "checking compiler flags""... $ac_c" 1>&6 -echo "configure:1345: checking compiler flags" >&5 +echo "configure:1348: checking compiler flags" >&5 if test "${GCC}" = "yes" ; then SHLIB_LD="" SHLIB_LD_LIBS="" @@ -1440,7 +1443,7 @@ echo "configure:1345: checking compiler flags" >&5 ;; *) cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_win_64bit=no else @@ -1691,7 +1694,7 @@ EOF if test "${GCC}" = "yes" ; then echo $ac_n "checking for SEH support in compiler""... $ac_c" 1>&6 -echo "configure:1695: checking for SEH support in compiler" >&5 +echo "configure:1698: checking for SEH support in compiler" >&5 if eval "test \"`echo '$''{'tcl_cv_seh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1699,7 +1702,7 @@ else tcl_cv_seh=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_seh=yes else @@ -1748,12 +1751,12 @@ EOF # sufficient for getting the current code to work. # echo $ac_n "checking for EXCEPTION_DISPOSITION support in include files""... $ac_c" 1>&6 -echo "configure:1752: checking for EXCEPTION_DISPOSITION support in include files" >&5 +echo "configure:1755: checking for EXCEPTION_DISPOSITION support in include files" >&5 if eval "test \"`echo '$''{'tcl_cv_eh_disposition'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_eh_disposition=yes else @@ -1792,12 +1795,12 @@ EOF # used by mingw and cygwin is known to do this. echo $ac_n "checking for winnt.h that ignores VOID define""... $ac_c" 1>&6 -echo "configure:1796: checking for winnt.h that ignores VOID define" >&5 +echo "configure:1799: checking for winnt.h that ignores VOID define" >&5 if eval "test \"`echo '$''{'tcl_cv_winnt_ignore_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_winnt_ignore_void=yes else @@ -1839,12 +1842,12 @@ EOF # warning when initializing a union member. echo $ac_n "checking for cast to union support""... $ac_c" 1>&6 -echo "configure:1843: checking for cast to union support" >&5 +echo "configure:1846: checking for cast to union support" >&5 if eval "test \"`echo '$''{'tcl_cv_cast_to_union'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_cast_to_union=yes else @@ -1888,7 +1891,7 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1892: checking how to run the C preprocessor" >&5 +echo "configure:1895: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1903,13 +1906,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1920,13 +1923,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1937,13 +1940,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1969,17 +1972,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:1973: checking for errno.h" >&5 +echo "configure:1976: checking for errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2009,20 +2012,20 @@ fi if test "${MACHINE}" = "X86" ; then echo $ac_n "checking availability of _strtoi64""... $ac_c" 1>&6 -echo "configure:2013: checking availability of _strtoi64" >&5 +echo "configure:2016: checking availability of _strtoi64" >&5 if eval "test \"`echo '$''{'tcl_have_strtoi64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { _strtoi64(0,0,0) ; return 0; } EOF -if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_have_strtoi64=yes else @@ -2051,7 +2054,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:2055: checking for build with symbols" >&5 +echo "configure:2058: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -2112,7 +2115,7 @@ TK_DBGX=${DBGX} echo $ac_n "checking whether to embed manifest""... $ac_c" 1>&6 -echo "configure:2116: checking whether to embed manifest" >&5 +echo "configure:2119: checking whether to embed manifest" >&5 # Check whether --enable-embedded-manifest or --disable-embedded-manifest was given. if test "${enable_embedded_manifest+set}" = set; then enableval="$enable_embedded_manifest" @@ -2129,7 +2132,7 @@ fi -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe cat > conftest.$ac_ext <= 1400 @@ -2166,7 +2169,7 @@ rm -f conftest* echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 -echo "configure:2170: checking the location of tclConfig.sh" >&5 +echo "configure:2173: checking the location of tclConfig.sh" >&5 if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win @@ -2194,7 +2197,7 @@ fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:2198: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "configure:2201: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 @@ -2247,14 +2250,14 @@ echo "configure:2198: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6 -echo "configure:2251: checking for tclsh in Tcl build directory" >&5 +echo "configure:2254: checking for tclsh in Tcl build directory" >&5 BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT} echo "$ac_t""$BUILD_TCLSH" 1>&6 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:2258: checking for tclsh" >&5 +echo "configure:2261: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/win/tcl.m4 b/win/tcl.m4 index e06b1e0..752f022 100644 --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -408,7 +408,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # which requires x86|amd64|ia64. MACHINE="X86" - AC_CACHE_CHECK(for cross-compile version of gcc, + if test "$GCC" = "yes"; then + + AC_CACHE_CHECK(for cross-compile version of gcc, ac_cv_cross, AC_TRY_COMPILE([ #ifdef __WIN32__ @@ -417,9 +419,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ], [], ac_cv_cross=yes, ac_cv_cross=no) - ) + ) - if test "$ac_cv_cross" = "yes"; then + if test "$ac_cv_cross" = "yes"; then case "$do64bit" in amd64|x64|yes) CC="x86_64-w64-mingw32-gcc" @@ -436,6 +438,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ RC="i686-w64-mingw32-windres" ;; esac + fi fi # Check for a bug in gcc's windres that causes the -- cgit v0.12 From 33bde427645f8931d8634cdba1819b5e66a69bd0 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 1 Apr 2012 18:36:55 +0000 Subject: re-generate configure --- ChangeLog | 4 +- unix/configure | 138 ++++++++++++++- win/configure | 538 ++++++++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 578 insertions(+), 102 deletions(-) diff --git a/ChangeLog b/ChangeLog index 000cc66..72e6f47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,10 +2,10 @@ * unix/tcl.m4: [Bug 3511806] Compiler checks too early * unix/configure.in: This change allows to build the cygwin - * and mingw32 ports of Tcl/Tk to build + * unix/configure and mingw32 ports of Tcl/Tk to build * win/tcl.m4: out-of-the-box using a native or cross- * win/configure.in: compiler. - * (autoconf has to run yet!) + * win/configure 2012-03-21 Jan Nijtmans diff --git a/unix/configure b/unix/configure index 6ea35a4..e4fbf75 100755 --- a/unix/configure +++ b/unix/configure @@ -5133,17 +5133,80 @@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - CYGWIN_*) + CYGWIN_*|MINGW32*) SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" - DL_OBJS="tclLoadDl.o" + DL_OBJS="tclLoadDl.o tclWinError.o" DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" TCL_NEEDS_EXP_FILE=1 TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a' + echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5 +echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6 +if test "${ac_cv_cygwin+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #ifdef __CYGWIN__ + #error cygwin + #endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_cygwin=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_cygwin=yes +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5 +echo "${ECHO_T}$ac_cv_cygwin" >&6 + if test "$ac_cv_cygwin" = "no"; then + { { echo "$as_me:$LINENO: error: ${CC} is not a cygwin compiler." >&5 +echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;} + { (exit 1); exit 1; }; } + fi ;; dgux*) SHLIB_CFLAGS="-K PIC" @@ -7084,7 +7147,7 @@ fi case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*) ;; + CYGWIN_*|MINGW32_*) ;; IRIX*) ;; NetBSD-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; @@ -7155,6 +7218,75 @@ fi + # See if the compiler supports casting to a union type. + # This is used to stop gcc from printing a compiler + # warning when initializing a union member. + + echo "$as_me:$LINENO: checking for cast to union support" >&5 +echo $ECHO_N "checking for cast to union support... $ECHO_C" >&6 +if test "${tcl_cv_cast_to_union+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + union foo { int i; double d; }; + union foo f = (union foo) (int) 0; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + tcl_cv_cast_to_union=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +tcl_cv_cast_to_union=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $tcl_cv_cast_to_union" >&5 +echo "${ECHO_T}$tcl_cv_cast_to_union" >&6 + if test "$tcl_cv_cast_to_union" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CAST_TO_UNION 1 +_ACEOF + + fi + # FIXME: This subst was left in only because the TCL_DL_LIBS # entry in tclConfig.sh uses it. It is not clear why someone # would use TCL_DL_LIBS instead of TCL_LIBS. diff --git a/win/configure b/win/configure index 37df097..ddcc116 100755 --- a/win/configure +++ b/win/configure @@ -3029,79 +3029,6 @@ fi #-------------------------------------------------------------------- -# Perform additinal compiler tests. -#-------------------------------------------------------------------- - - -echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5 -echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6 -if test "${ac_cv_cygwin+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#ifdef __CYGWIN__ -#error cygwin -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cygwin=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_cygwin=yes -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5 -echo "${ECHO_T}$ac_cv_cygwin" >&6 -if test "$ac_cv_cygwin" = "yes" ; then - { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported. -A maintainer for the Cygwin port of Tcl/Tk is needed. See the README -file for information about building with Mingw." >&5 -echo "$as_me: error: Compiling under Cygwin is not currently supported. -A maintainer for the Cygwin port of Tcl/Tk is needed. See the README -file for information about building with Mingw." >&2;} - { (exit 1); exit 1; }; } -fi - -#-------------------------------------------------------------------- # Determines the correct binary file extension (.o, .obj, .exe etc.) #-------------------------------------------------------------------- @@ -3350,6 +3277,87 @@ fi # which requires x86|amd64|ia64. MACHINE="X86" + if test "$GCC" = "yes"; then + + echo "$as_me:$LINENO: checking for cross-compile version of gcc" >&5 +echo $ECHO_N "checking for cross-compile version of gcc... $ECHO_C" >&6 +if test "${ac_cv_cross+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #ifdef __WIN32__ + #error cross-compiler + #endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_cross=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_cross=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $ac_cv_cross" >&5 +echo "${ECHO_T}$ac_cv_cross" >&6 + + if test "$ac_cv_cross" = "yes"; then + case "$do64bit" in + amd64|x64|yes) + CC="x86_64-w64-mingw32-gcc" + LD="x86_64-w64-mingw32-ld" + AR="x86_64-w64-mingw32-ar" + RANLIB="x86_64-w64-mingw32-ranlib" + RC="x86_64-w64-mingw32-windres" + ;; + *) + CC="i686-w64-mingw32-gcc" + LD="i686-w64-mingw32-ld" + AR="i686-w64-mingw32-ar" + RANLIB="i686-w64-mingw32-ranlib" + RC="i686-w64-mingw32-windres" + ;; + esac + fi + fi + # Check for a bug in gcc's windres that causes the # compile to fail when a Windows native path is # passed into windres. The mingw toolchain requires @@ -3383,7 +3391,7 @@ echo "${ECHO_T}yes" >&6 cyg_conftest= fi - if test "$CYGPATH" = "echo" || test "$ac_cv_cygwin" = "yes"; then + if test "$CYGPATH" = "echo"; then DEPARG='"$<"' else DEPARG='"$(shell $(CYGPATH) $<)"' @@ -3391,6 +3399,72 @@ echo "${ECHO_T}yes" >&6 # set various compiler flags depending on whether we are using gcc or cl + if test "${GCC}" = "yes" ; then + echo "$as_me:$LINENO: checking for mingw32 version of gcc" >&5 +echo $ECHO_N "checking for mingw32 version of gcc... $ECHO_C" >&6 +if test "${ac_cv_win32+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #ifdef __WIN32__ + #error win32 + #endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_win32=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_win32=yes +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $ac_cv_win32" >&5 +echo "${ECHO_T}$ac_cv_win32" >&6 + if test "$ac_cv_win32" != "yes"; then + { { echo "$as_me:$LINENO: error: ${CC} cannot produce win32 executables." >&5 +echo "$as_me: error: ${CC} cannot produce win32 executables." >&2;} + { (exit 1); exit 1; }; } + fi + fi + echo "$as_me:$LINENO: checking compiler flags" >&5 echo $ECHO_N "checking compiler flags... $ECHO_C" >&6 if test "${GCC}" = "yes" ; then @@ -3413,21 +3487,6 @@ echo $ECHO_N "checking compiler flags... $ECHO_C" >&6 extra_cflags="-pipe" extra_ldflags="-pipe" - if test "$ac_cv_cygwin" = "yes"; then - touch ac$$.c - if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then - case "$extra_cflags" in - *-mwin32*) ;; - *) extra_cflags="-mwin32 $extra_cflags" ;; - esac - case "$extra_ldflags" in - *-mwin32*) ;; - *) extra_ldflags="-mwin32 $extra_ldflags" ;; - esac - fi - rm -f ac$$.o ac$$.c - fi - if test "${SHARED_BUILD}" = "0" ; then # static echo "$as_me:$LINENO: result: using static flags" >&5 @@ -3520,9 +3579,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifdef _WIN64 + #ifdef _WIN64 #error 64-bit - #endif + #endif int main () @@ -3871,6 +3930,291 @@ _ACEOF fi + if test "${GCC}" = "yes" ; then + echo "$as_me:$LINENO: checking for SEH support in compiler" >&5 +echo $ECHO_N "checking for SEH support in compiler... $ECHO_C" >&6 +if test "${tcl_cv_seh+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + tcl_cv_seh=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #define WIN32_LEAN_AND_MEAN + #include + #undef WIN32_LEAN_AND_MEAN + + int main(int argc, char** argv) { + int a, b = 0; + __try { + a = 666 / b; + } + __except (EXCEPTION_EXECUTE_HANDLER) { + return 0; + } + return 1; + } + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + tcl_cv_seh=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +tcl_cv_seh=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + +fi +echo "$as_me:$LINENO: result: $tcl_cv_seh" >&5 +echo "${ECHO_T}$tcl_cv_seh" >&6 + if test "$tcl_cv_seh" = "no" ; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_NO_SEH 1 +_ACEOF + + fi + + # + # Check to see if the excpt.h include file provided contains the + # definition for EXCEPTION_DISPOSITION; if not, which is the case + # with Cygwin's version as of 2002-04-10, define it to be int, + # sufficient for getting the current code to work. + # + echo "$as_me:$LINENO: checking for EXCEPTION_DISPOSITION support in include files" >&5 +echo $ECHO_N "checking for EXCEPTION_DISPOSITION support in include files... $ECHO_C" >&6 +if test "${tcl_cv_eh_disposition+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +# define WIN32_LEAN_AND_MEAN +# include +# undef WIN32_LEAN_AND_MEAN + +int +main () +{ + + EXCEPTION_DISPOSITION x; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + tcl_cv_eh_disposition=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +tcl_cv_eh_disposition=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $tcl_cv_eh_disposition" >&5 +echo "${ECHO_T}$tcl_cv_eh_disposition" >&6 + if test "$tcl_cv_eh_disposition" = "no" ; then + +cat >>confdefs.h <<\_ACEOF +#define EXCEPTION_DISPOSITION int +_ACEOF + + fi + + # Check to see if winnt.h defines CHAR, SHORT, and LONG + # even if VOID has already been #defined. The win32api + # used by mingw and cygwin is known to do this. + + echo "$as_me:$LINENO: checking for winnt.h that ignores VOID define" >&5 +echo $ECHO_N "checking for winnt.h that ignores VOID define... $ECHO_C" >&6 +if test "${tcl_cv_winnt_ignore_void+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #define VOID void + #define WIN32_LEAN_AND_MEAN + #include + #undef WIN32_LEAN_AND_MEAN + +int +main () +{ + + CHAR c; + SHORT s; + LONG l; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + tcl_cv_winnt_ignore_void=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +tcl_cv_winnt_ignore_void=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $tcl_cv_winnt_ignore_void" >&5 +echo "${ECHO_T}$tcl_cv_winnt_ignore_void" >&6 + if test "$tcl_cv_winnt_ignore_void" = "yes" ; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WINNT_IGNORE_VOID 1 +_ACEOF + + fi + + # See if the compiler supports casting to a union type. + # This is used to stop gcc from printing a compiler + # warning when initializing a union member. + + echo "$as_me:$LINENO: checking for cast to union support" >&5 +echo $ECHO_N "checking for cast to union support... $ECHO_C" >&6 +if test "${tcl_cv_cast_to_union+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + union foo { int i; double d; }; + union foo f = (union foo) (int) 0; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + tcl_cv_cast_to_union=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +tcl_cv_cast_to_union=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $tcl_cv_cast_to_union" >&5 +echo "${ECHO_T}$tcl_cv_cast_to_union" >&6 + if test "$tcl_cv_cast_to_union" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CAST_TO_UNION 1 +_ACEOF + + fi + fi + # DL_LIBS is empty, but then we match the Unix version @@ -4034,7 +4378,7 @@ fi echo "$as_me:$LINENO: checking availability of _strtoi64" >&5 echo $ECHO_N "checking availability of _strtoi64... $ECHO_C" >&6 -if test "${tcl_have_strtoi64+set}" = set; then +if test "${tcl_cv_strtoi64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4075,19 +4419,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - tcl_have_strtoi64=yes + tcl_cv_strtoi64=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -tcl_have_strtoi64=no +tcl_cv_strtoi64=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $tcl_have_strtoi64" >&5 -echo "${ECHO_T}$tcl_have_strtoi64" >&6 -if test $tcl_have_strtoi64 = no; then +echo "$as_me:$LINENO: result: $tcl_cv_strtoi64" >&5 +echo "${ECHO_T}$tcl_cv_strtoi64" >&6 +if test $tcl_cv_strtoi64 = no; then cat >>confdefs.h <<\_ACEOF #define NO_STRTOI64 1 -- cgit v0.12 From 17693a76b350ba982a591b6dafc3f1816d9c316f Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 2 Apr 2012 09:14:24 +0000 Subject: gcc warning: signed-unsigned compare --- xlib/xcolors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xlib/xcolors.c b/xlib/xcolors.c index 7a83146..04cb1af 100644 --- a/xlib/xcolors.c +++ b/xlib/xcolors.c @@ -17,7 +17,7 @@ * Index array. For each of the characters 'a'-'y', this table gives the first color * starting with that character in the xColors table. */ -static int az[] = {0, 4, 12, 19, 43, 43, 46, 56, 58, 60, 60, 61, 84, 99, +static unsigned char az[] = {0, 4, 12, 19, 43, 43, 46, 56, 58, 60, 60, 61, 84, 99, 102, 107, 118, 118, 121, 134, 138, 138, 140, 143, 143, 145}; /* @@ -351,7 +351,7 @@ XParseColor( * p = pointer to current element being considered. */ int r = (spec[0] - 'A') & 0xdf; - if (r > (sizeof(az)/sizeof(az[0] - 1))) { + if (r >= (int) sizeof(az) - 1) { return 0; } size = az[r + 1] - az[r]; -- cgit v0.12 From ca830add40b2f1d21998d01aa0a67b9d0d4dd275 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 6 Apr 2012 21:47:15 +0000 Subject: format tk.decls like tcl8.5/8.6, re-generiate tk(Int)Decls.h --- generic/tk.decls | 1434 +++++++++++++++++++++----------------------------- generic/tkDecls.h | 1233 +++++++++++++++++++++---------------------- generic/tkIntDecls.h | 758 +++++++++++++------------- 3 files changed, 1590 insertions(+), 1835 deletions(-) diff --git a/generic/tk.decls b/generic/tk.decls index 2424ee0..c024cdb 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -4,7 +4,6 @@ # functions that are exported by the Tk library via the stubs table. # This file is used to generate the tkDecls.h, tkPlatDecls.h, # tkStub.c, and tkPlatStub.c files. -# # # Copyright (c) 1998-2000 Ajuba Solutions. # @@ -25,1218 +24,996 @@ hooks {tkPlat tkInt tkIntPlat tkIntXlib} # the an index should never be reused for a different function in order # to preserve backwards compatibility. -declare 0 generic { - void Tk_MainLoop (void) +declare 0 { + void Tk_MainLoop(void) } - -declare 1 generic { - XColor *Tk_3DBorderColor (Tk_3DBorder border) +declare 1 { + XColor *Tk_3DBorderColor(Tk_3DBorder border) } - -declare 2 generic { - GC Tk_3DBorderGC (Tk_Window tkwin, Tk_3DBorder border, +declare 2 { + GC Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border, int which) } - -declare 3 generic { - void Tk_3DHorizontalBevel (Tk_Window tkwin, +declare 3 { + void Tk_3DHorizontalBevel(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief) } - -declare 4 generic { - void Tk_3DVerticalBevel (Tk_Window tkwin, +declare 4 { + void Tk_3DVerticalBevel(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief) } - -declare 5 generic { - void Tk_AddOption (Tk_Window tkwin, CONST char *name, - CONST char *value, int priority) +declare 5 { + void Tk_AddOption(Tk_Window tkwin, const char *name, + const char *value, int priority) } - -declare 6 generic { - void Tk_BindEvent (Tk_BindingTable bindingTable, +declare 6 { + void Tk_BindEvent(Tk_BindingTable bindingTable, XEvent *eventPtr, Tk_Window tkwin, int numObjects, ClientData *objectPtr) } - -declare 7 generic { - void Tk_CanvasDrawableCoords (Tk_Canvas canvas, +declare 7 { + void Tk_CanvasDrawableCoords(Tk_Canvas canvas, double x, double y, short *drawableXPtr, short *drawableYPtr) } - -declare 8 generic { - void Tk_CanvasEventuallyRedraw (Tk_Canvas canvas, int x1, int y1, +declare 8 { + void Tk_CanvasEventuallyRedraw(Tk_Canvas canvas, int x1, int y1, int x2, int y2) } - -declare 9 generic { - int Tk_CanvasGetCoord (Tcl_Interp *interp, - Tk_Canvas canvas, CONST char *str, double *doublePtr) +declare 9 { + int Tk_CanvasGetCoord(Tcl_Interp *interp, + Tk_Canvas canvas, const char *str, double *doublePtr) } - -declare 10 generic { - Tk_CanvasTextInfo *Tk_CanvasGetTextInfo (Tk_Canvas canvas) +declare 10 { + Tk_CanvasTextInfo *Tk_CanvasGetTextInfo(Tk_Canvas canvas) } - -declare 11 generic { - int Tk_CanvasPsBitmap (Tcl_Interp *interp, +declare 11 { + int Tk_CanvasPsBitmap(Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height) } - -declare 12 generic { - int Tk_CanvasPsColor (Tcl_Interp *interp, +declare 12 { + int Tk_CanvasPsColor(Tcl_Interp *interp, Tk_Canvas canvas, XColor *colorPtr) } - -declare 13 generic { - int Tk_CanvasPsFont (Tcl_Interp *interp, +declare 13 { + int Tk_CanvasPsFont(Tcl_Interp *interp, Tk_Canvas canvas, Tk_Font font) } - -declare 14 generic { - void Tk_CanvasPsPath (Tcl_Interp *interp, +declare 14 { + void Tk_CanvasPsPath(Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr, int numPoints) } - -declare 15 generic { - int Tk_CanvasPsStipple (Tcl_Interp *interp, +declare 15 { + int Tk_CanvasPsStipple(Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap) } - -declare 16 generic { - double Tk_CanvasPsY (Tk_Canvas canvas, double y) +declare 16 { + double Tk_CanvasPsY(Tk_Canvas canvas, double y) } - -declare 17 generic { - void Tk_CanvasSetStippleOrigin (Tk_Canvas canvas, GC gc) +declare 17 { + void Tk_CanvasSetStippleOrigin(Tk_Canvas canvas, GC gc) } - -declare 18 generic { - int Tk_CanvasTagsParseProc (ClientData clientData, Tcl_Interp *interp, - Tk_Window tkwin, CONST char *value, char *widgRec, int offset) +declare 18 { + int Tk_CanvasTagsParseProc(ClientData clientData, Tcl_Interp *interp, + Tk_Window tkwin, const char *value, char *widgRec, int offset) } - -declare 19 generic { - char * Tk_CanvasTagsPrintProc (ClientData clientData, Tk_Window tkwin, +declare 19 { + char *Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } - -declare 20 generic { - Tk_Window Tk_CanvasTkwin (Tk_Canvas canvas) +declare 20 { + Tk_Window Tk_CanvasTkwin(Tk_Canvas canvas) } - -declare 21 generic { - void Tk_CanvasWindowCoords (Tk_Canvas canvas, double x, double y, +declare 21 { + void Tk_CanvasWindowCoords(Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr) } - -declare 22 generic { - void Tk_ChangeWindowAttributes (Tk_Window tkwin, unsigned long valueMask, +declare 22 { + void Tk_ChangeWindowAttributes(Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes *attsPtr) } - -declare 23 generic { - int Tk_CharBbox (Tk_TextLayout layout, int index, int *xPtr, +declare 23 { + int Tk_CharBbox(Tk_TextLayout layout, int index, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } - -declare 24 generic { - void Tk_ClearSelection (Tk_Window tkwin, Atom selection) +declare 24 { + void Tk_ClearSelection(Tk_Window tkwin, Atom selection) } - -declare 25 generic { - int Tk_ClipboardAppend (Tcl_Interp *interp,Tk_Window tkwin, - Atom target, Atom format, char* buffer) +declare 25 { + int Tk_ClipboardAppend(Tcl_Interp *interp, Tk_Window tkwin, + Atom target, Atom format, char *buffer) } - -declare 26 generic { - int Tk_ClipboardClear (Tcl_Interp *interp, Tk_Window tkwin) +declare 26 { + int Tk_ClipboardClear(Tcl_Interp *interp, Tk_Window tkwin) } - -declare 27 generic { - int Tk_ConfigureInfo (Tcl_Interp *interp, +declare 27 { + int Tk_ConfigureInfo(Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, - char *widgRec, CONST char *argvName, int flags) + char *widgRec, const char *argvName, int flags) } - -declare 28 generic { - int Tk_ConfigureValue (Tcl_Interp *interp, +declare 28 { + int Tk_ConfigureValue(Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, - char *widgRec, CONST char *argvName, int flags) + char *widgRec, const char *argvName, int flags) } - -declare 29 generic { - int Tk_ConfigureWidget (Tcl_Interp *interp, +declare 29 { + int Tk_ConfigureWidget(Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags) } - -declare 30 generic { - void Tk_ConfigureWindow (Tk_Window tkwin, +declare 30 { + void Tk_ConfigureWindow(Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr) } - -declare 31 generic { - Tk_TextLayout Tk_ComputeTextLayout (Tk_Font font, - CONST char *str, int numChars, int wrapLength, +declare 31 { + Tk_TextLayout Tk_ComputeTextLayout(Tk_Font font, + const char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr) } - -declare 32 generic { - Tk_Window Tk_CoordsToWindow (int rootX, int rootY, Tk_Window tkwin) +declare 32 { + Tk_Window Tk_CoordsToWindow(int rootX, int rootY, Tk_Window tkwin) } - -declare 33 generic { - unsigned long Tk_CreateBinding (Tcl_Interp *interp, +declare 33 { + unsigned long Tk_CreateBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, - CONST char *eventStr, CONST char *command, int append) + const char *eventStr, const char *script, int append) } - -declare 34 generic { - Tk_BindingTable Tk_CreateBindingTable (Tcl_Interp *interp) +declare 34 { + Tk_BindingTable Tk_CreateBindingTable(Tcl_Interp *interp) } - -declare 35 generic { - Tk_ErrorHandler Tk_CreateErrorHandler (Display *display, +declare 35 { + Tk_ErrorHandler Tk_CreateErrorHandler(Display *display, int errNum, int request, int minorCode, Tk_ErrorProc *errorProc, ClientData clientData) } - -declare 36 generic { - void Tk_CreateEventHandler (Tk_Window token, +declare 36 { + void Tk_CreateEventHandler(Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData) } - -declare 37 generic { - void Tk_CreateGenericHandler (Tk_GenericProc *proc, ClientData clientData) +declare 37 { + void Tk_CreateGenericHandler(Tk_GenericProc *proc, ClientData clientData) } - -declare 38 generic { - void Tk_CreateImageType (Tk_ImageType *typePtr) +declare 38 { + void Tk_CreateImageType(Tk_ImageType *typePtr) } - -declare 39 generic { - void Tk_CreateItemType (Tk_ItemType *typePtr) +declare 39 { + void Tk_CreateItemType(Tk_ItemType *typePtr) } - -declare 40 generic { - void Tk_CreatePhotoImageFormat (Tk_PhotoImageFormat *formatPtr) +declare 40 { + void Tk_CreatePhotoImageFormat(Tk_PhotoImageFormat *formatPtr) } - -declare 41 generic { - void Tk_CreateSelHandler (Tk_Window tkwin, +declare 41 { + void Tk_CreateSelHandler(Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc *proc, ClientData clientData, Atom format) } - -declare 42 generic { - Tk_Window Tk_CreateWindow (Tcl_Interp *interp, - Tk_Window parent, CONST char *name, CONST char *screenName) +declare 42 { + Tk_Window Tk_CreateWindow(Tcl_Interp *interp, + Tk_Window parent, const char *name, const char *screenName) } - -declare 43 generic { - Tk_Window Tk_CreateWindowFromPath (Tcl_Interp *interp, Tk_Window tkwin, - CONST char *pathName, CONST char *screenName) +declare 43 { + Tk_Window Tk_CreateWindowFromPath(Tcl_Interp *interp, Tk_Window tkwin, + const char *pathName, const char *screenName) } - -declare 44 generic { - int Tk_DefineBitmap (Tcl_Interp *interp, CONST char *name, - CONST char *source, int width, int height) +declare 44 { + int Tk_DefineBitmap(Tcl_Interp *interp, const char *name, + const char *source, int width, int height) } - -declare 45 generic { - void Tk_DefineCursor (Tk_Window window, Tk_Cursor cursor) +declare 45 { + void Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor) } - -declare 46 generic { - void Tk_DeleteAllBindings (Tk_BindingTable bindingTable, ClientData object) +declare 46 { + void Tk_DeleteAllBindings(Tk_BindingTable bindingTable, ClientData object) } - -declare 47 generic { - int Tk_DeleteBinding (Tcl_Interp *interp, +declare 47 { + int Tk_DeleteBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, - CONST char *eventStr) + const char *eventStr) } - -declare 48 generic { - void Tk_DeleteBindingTable (Tk_BindingTable bindingTable) +declare 48 { + void Tk_DeleteBindingTable(Tk_BindingTable bindingTable) } - -declare 49 generic { - void Tk_DeleteErrorHandler (Tk_ErrorHandler handler) +declare 49 { + void Tk_DeleteErrorHandler(Tk_ErrorHandler handler) } - -declare 50 generic { - void Tk_DeleteEventHandler (Tk_Window token, +declare 50 { + void Tk_DeleteEventHandler(Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData) } - -declare 51 generic { - void Tk_DeleteGenericHandler (Tk_GenericProc *proc, ClientData clientData) +declare 51 { + void Tk_DeleteGenericHandler(Tk_GenericProc *proc, ClientData clientData) } - -declare 52 generic { - void Tk_DeleteImage (Tcl_Interp *interp, CONST char *name) +declare 52 { + void Tk_DeleteImage(Tcl_Interp *interp, const char *name) } - -declare 53 generic { - void Tk_DeleteSelHandler (Tk_Window tkwin, Atom selection, Atom target) +declare 53 { + void Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection, Atom target) } - -declare 54 generic { - void Tk_DestroyWindow (Tk_Window tkwin) +declare 54 { + void Tk_DestroyWindow(Tk_Window tkwin) } - -declare 55 generic { - CONST84_RETURN char * Tk_DisplayName (Tk_Window tkwin) +declare 55 { + CONST84_RETURN char *Tk_DisplayName(Tk_Window tkwin) } - -declare 56 generic { - int Tk_DistanceToTextLayout (Tk_TextLayout layout, int x, int y) +declare 56 { + int Tk_DistanceToTextLayout(Tk_TextLayout layout, int x, int y) } - -declare 57 generic { - void Tk_Draw3DPolygon (Tk_Window tkwin, +declare 57 { + void Tk_Draw3DPolygon(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief) } - -declare 58 generic { - void Tk_Draw3DRectangle (Tk_Window tkwin, Drawable drawable, +declare 58 { + void Tk_Draw3DRectangle(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief) } - -declare 59 generic { - void Tk_DrawChars (Display *display, Drawable drawable, GC gc, - Tk_Font tkfont, CONST char *source, int numBytes, int x, int y) +declare 59 { + void Tk_DrawChars(Display *display, Drawable drawable, GC gc, + Tk_Font tkfont, const char *source, int numBytes, int x, int y) } - -declare 60 generic { - void Tk_DrawFocusHighlight (Tk_Window tkwin, GC gc, int width, +declare 60 { + void Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc, int width, Drawable drawable) } - -declare 61 generic { - void Tk_DrawTextLayout (Display *display, +declare 61 { + void Tk_DrawTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar) } - -declare 62 generic { - void Tk_Fill3DPolygon (Tk_Window tkwin, +declare 62 { + void Tk_Fill3DPolygon(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief) } - -declare 63 generic { - void Tk_Fill3DRectangle (Tk_Window tkwin, +declare 63 { + void Tk_Fill3DRectangle(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief) } - -declare 64 generic { - Tk_PhotoHandle Tk_FindPhoto (Tcl_Interp *interp, CONST char *imageName) +declare 64 { + Tk_PhotoHandle Tk_FindPhoto(Tcl_Interp *interp, const char *imageName) } - -declare 65 generic { - Font Tk_FontId (Tk_Font font) +declare 65 { + Font Tk_FontId(Tk_Font font) } - -declare 66 generic { - void Tk_Free3DBorder (Tk_3DBorder border) +declare 66 { + void Tk_Free3DBorder(Tk_3DBorder border) } - -declare 67 generic { - void Tk_FreeBitmap (Display *display, Pixmap bitmap) +declare 67 { + void Tk_FreeBitmap(Display *display, Pixmap bitmap) } - -declare 68 generic { - void Tk_FreeColor (XColor *colorPtr) +declare 68 { + void Tk_FreeColor(XColor *colorPtr) } - -declare 69 generic { - void Tk_FreeColormap (Display *display, Colormap colormap) +declare 69 { + void Tk_FreeColormap(Display *display, Colormap colormap) } - -declare 70 generic { - void Tk_FreeCursor (Display *display, Tk_Cursor cursor) +declare 70 { + void Tk_FreeCursor(Display *display, Tk_Cursor cursor) } - -declare 71 generic { - void Tk_FreeFont (Tk_Font f) +declare 71 { + void Tk_FreeFont(Tk_Font f) } - -declare 72 generic { - void Tk_FreeGC (Display *display, GC gc) +declare 72 { + void Tk_FreeGC(Display *display, GC gc) } - -declare 73 generic { - void Tk_FreeImage (Tk_Image image) +declare 73 { + void Tk_FreeImage(Tk_Image image) } - -declare 74 generic { - void Tk_FreeOptions (Tk_ConfigSpec *specs, +declare 74 { + void Tk_FreeOptions(Tk_ConfigSpec *specs, char *widgRec, Display *display, int needFlags) } - -declare 75 generic { - void Tk_FreePixmap (Display *display, Pixmap pixmap) +declare 75 { + void Tk_FreePixmap(Display *display, Pixmap pixmap) } - -declare 76 generic { - void Tk_FreeTextLayout (Tk_TextLayout textLayout) +declare 76 { + void Tk_FreeTextLayout(Tk_TextLayout textLayout) } - -declare 77 generic { - void Tk_FreeXId (Display *display, XID xid) +declare 77 { + void Tk_FreeXId(Display *display, XID xid) } - -declare 78 generic { - GC Tk_GCForColor (XColor *colorPtr, Drawable drawable) +declare 78 { + GC Tk_GCForColor(XColor *colorPtr, Drawable drawable) } - -declare 79 generic { - void Tk_GeometryRequest (Tk_Window tkwin, int reqWidth, int reqHeight) +declare 79 { + void Tk_GeometryRequest(Tk_Window tkwin, int reqWidth, int reqHeight) } - -declare 80 generic { - Tk_3DBorder Tk_Get3DBorder (Tcl_Interp *interp, Tk_Window tkwin, +declare 80 { + Tk_3DBorder Tk_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName) } - -declare 81 generic { - void Tk_GetAllBindings (Tcl_Interp *interp, +declare 81 { + void Tk_GetAllBindings(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object) } - -declare 82 generic { - int Tk_GetAnchor (Tcl_Interp *interp, - CONST char *str, Tk_Anchor *anchorPtr) +declare 82 { + int Tk_GetAnchor(Tcl_Interp *interp, + const char *str, Tk_Anchor *anchorPtr) } - -declare 83 generic { - CONST84_RETURN char * Tk_GetAtomName (Tk_Window tkwin, Atom atom) +declare 83 { + CONST84_RETURN char *Tk_GetAtomName(Tk_Window tkwin, Atom atom) } - -declare 84 generic { - CONST84_RETURN char * Tk_GetBinding (Tcl_Interp *interp, +declare 84 { + CONST84_RETURN char *Tk_GetBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, - CONST char *eventStr) + const char *eventStr) } - -declare 85 generic { - Pixmap Tk_GetBitmap (Tcl_Interp *interp, Tk_Window tkwin, CONST char * str) +declare 85 { + Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, const char *str) } - -declare 86 generic { - Pixmap Tk_GetBitmapFromData (Tcl_Interp *interp, - Tk_Window tkwin, CONST char *source, int width, int height) +declare 86 { + Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp, + Tk_Window tkwin, const char *source, int width, int height) } - -declare 87 generic { - int Tk_GetCapStyle (Tcl_Interp *interp, CONST char *str, int *capPtr) +declare 87 { + int Tk_GetCapStyle(Tcl_Interp *interp, const char *str, int *capPtr) } - -declare 88 generic { - XColor * Tk_GetColor (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name) +declare 88 { + XColor *Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name) } - -declare 89 generic { - XColor * Tk_GetColorByValue (Tk_Window tkwin, XColor *colorPtr) +declare 89 { + XColor *Tk_GetColorByValue(Tk_Window tkwin, XColor *colorPtr) } - -declare 90 generic { - Colormap Tk_GetColormap (Tcl_Interp *interp, Tk_Window tkwin, - CONST char *str) +declare 90 { + Colormap Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin, + const char *str) } - -declare 91 generic { - Tk_Cursor Tk_GetCursor (Tcl_Interp *interp, Tk_Window tkwin, +declare 91 { + Tk_Cursor Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str) } - -declare 92 generic { - Tk_Cursor Tk_GetCursorFromData (Tcl_Interp *interp, - Tk_Window tkwin, CONST char *source, CONST char *mask, +declare 92 { + Tk_Cursor Tk_GetCursorFromData(Tcl_Interp *interp, + Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg) } - -declare 93 generic { - Tk_Font Tk_GetFont (Tcl_Interp *interp, - Tk_Window tkwin, CONST char *str) +declare 93 { + Tk_Font Tk_GetFont(Tcl_Interp *interp, + Tk_Window tkwin, const char *str) } - -declare 94 generic { - Tk_Font Tk_GetFontFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 94 { + Tk_Font Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 95 generic { - void Tk_GetFontMetrics (Tk_Font font, Tk_FontMetrics *fmPtr) +declare 95 { + void Tk_GetFontMetrics(Tk_Font font, Tk_FontMetrics *fmPtr) } - -declare 96 generic { - GC Tk_GetGC (Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr) +declare 96 { + GC Tk_GetGC(Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr) } - -declare 97 generic { - Tk_Image Tk_GetImage (Tcl_Interp *interp, Tk_Window tkwin, CONST char *name, +declare 97 { + Tk_Image Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin, const char *name, Tk_ImageChangedProc *changeProc, ClientData clientData) } - -declare 98 generic { - ClientData Tk_GetImageMasterData (Tcl_Interp *interp, - CONST char *name, Tk_ImageType **typePtrPtr) +declare 98 { + ClientData Tk_GetImageMasterData(Tcl_Interp *interp, + const char *name, Tk_ImageType **typePtrPtr) } - -declare 99 generic { - Tk_ItemType * Tk_GetItemTypes (void) +declare 99 { + Tk_ItemType *Tk_GetItemTypes(void) } - -declare 100 generic { - int Tk_GetJoinStyle (Tcl_Interp *interp, CONST char *str, int *joinPtr) +declare 100 { + int Tk_GetJoinStyle(Tcl_Interp *interp, const char *str, int *joinPtr) } - -declare 101 generic { - int Tk_GetJustify (Tcl_Interp *interp, - CONST char *str, Tk_Justify *justifyPtr) +declare 101 { + int Tk_GetJustify(Tcl_Interp *interp, + const char *str, Tk_Justify *justifyPtr) } - -declare 102 generic { - int Tk_GetNumMainWindows (void) +declare 102 { + int Tk_GetNumMainWindows(void) } - -declare 103 generic { - Tk_Uid Tk_GetOption (Tk_Window tkwin, CONST char *name, - CONST char *className) +declare 103 { + Tk_Uid Tk_GetOption(Tk_Window tkwin, const char *name, + const char *className) } - -declare 104 generic { - int Tk_GetPixels (Tcl_Interp *interp, - Tk_Window tkwin, CONST char *str, int *intPtr) +declare 104 { + int Tk_GetPixels(Tcl_Interp *interp, + Tk_Window tkwin, const char *str, int *intPtr) } - -declare 105 generic { - Pixmap Tk_GetPixmap (Display *display, Drawable d, +declare 105 { + Pixmap Tk_GetPixmap(Display *display, Drawable d, int width, int height, int depth) } - -declare 106 generic { - int Tk_GetRelief (Tcl_Interp *interp, CONST char *name, int *reliefPtr) +declare 106 { + int Tk_GetRelief(Tcl_Interp *interp, const char *name, int *reliefPtr) } - -declare 107 generic { - void Tk_GetRootCoords (Tk_Window tkwin, int *xPtr, int *yPtr) +declare 107 { + void Tk_GetRootCoords(Tk_Window tkwin, int *xPtr, int *yPtr) } - -declare 108 generic { - int Tk_GetScrollInfo (Tcl_Interp *interp, +declare 108 { + int Tk_GetScrollInfo(Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr) } - -declare 109 generic { - int Tk_GetScreenMM (Tcl_Interp *interp, - Tk_Window tkwin, CONST char *str, double *doublePtr) +declare 109 { + int Tk_GetScreenMM(Tcl_Interp *interp, + Tk_Window tkwin, const char *str, double *doublePtr) } - -declare 110 generic { - int Tk_GetSelection (Tcl_Interp *interp, +declare 110 { + int Tk_GetSelection(Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData) } - -declare 111 generic { - Tk_Uid Tk_GetUid (CONST char *str) +declare 111 { + Tk_Uid Tk_GetUid(const char *str) } - -declare 112 generic { - Visual * Tk_GetVisual (Tcl_Interp *interp, - Tk_Window tkwin, CONST char *str, int *depthPtr, +declare 112 { + Visual *Tk_GetVisual(Tcl_Interp *interp, + Tk_Window tkwin, const char *str, int *depthPtr, Colormap *colormapPtr) } - -declare 113 generic { - void Tk_GetVRootGeometry (Tk_Window tkwin, +declare 113 { + void Tk_GetVRootGeometry(Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } - -declare 114 generic { - int Tk_Grab (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal) +declare 114 { + int Tk_Grab(Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal) } - -declare 115 generic { - void Tk_HandleEvent (XEvent *eventPtr) +declare 115 { + void Tk_HandleEvent(XEvent *eventPtr) } - -declare 116 generic { - Tk_Window Tk_IdToWindow (Display *display, Window window) +declare 116 { + Tk_Window Tk_IdToWindow(Display *display, Window window) } - -declare 117 generic { - void Tk_ImageChanged (Tk_ImageMaster master, int x, int y, +declare 117 { + void Tk_ImageChanged(Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight) } - -declare 118 generic { - int Tk_Init (Tcl_Interp *interp) +declare 118 { + int Tk_Init(Tcl_Interp *interp) } - -declare 119 generic { - Atom Tk_InternAtom (Tk_Window tkwin, CONST char *name) +declare 119 { + Atom Tk_InternAtom(Tk_Window tkwin, const char *name) } - -declare 120 generic { - int Tk_IntersectTextLayout (Tk_TextLayout layout, int x, int y, +declare 120 { + int Tk_IntersectTextLayout(Tk_TextLayout layout, int x, int y, int width, int height) } - -declare 121 generic { - void Tk_MaintainGeometry (Tk_Window slave, +declare 121 { + void Tk_MaintainGeometry(Tk_Window slave, Tk_Window master, int x, int y, int width, int height) } - -declare 122 generic { - Tk_Window Tk_MainWindow (Tcl_Interp *interp) +declare 122 { + Tk_Window Tk_MainWindow(Tcl_Interp *interp) } - -declare 123 generic { - void Tk_MakeWindowExist (Tk_Window tkwin) +declare 123 { + void Tk_MakeWindowExist(Tk_Window tkwin) } - -declare 124 generic { - void Tk_ManageGeometry (Tk_Window tkwin, +declare 124 { + void Tk_ManageGeometry(Tk_Window tkwin, Tk_GeomMgr *mgrPtr, ClientData clientData) } - -declare 125 generic { - void Tk_MapWindow (Tk_Window tkwin) +declare 125 { + void Tk_MapWindow(Tk_Window tkwin) } - -declare 126 generic { - int Tk_MeasureChars (Tk_Font tkfont, - CONST char *source, int numBytes, int maxPixels, +declare 126 { + int Tk_MeasureChars(Tk_Font tkfont, + const char *source, int numBytes, int maxPixels, int flags, int *lengthPtr) } - -declare 127 generic { - void Tk_MoveResizeWindow (Tk_Window tkwin, +declare 127 { + void Tk_MoveResizeWindow(Tk_Window tkwin, int x, int y, int width, int height) } - -declare 128 generic { - void Tk_MoveWindow (Tk_Window tkwin, int x, int y) +declare 128 { + void Tk_MoveWindow(Tk_Window tkwin, int x, int y) } - -declare 129 generic { - void Tk_MoveToplevelWindow (Tk_Window tkwin, int x, int y) +declare 129 { + void Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y) } - -declare 130 generic { - CONST84_RETURN char * Tk_NameOf3DBorder (Tk_3DBorder border) +declare 130 { + CONST84_RETURN char *Tk_NameOf3DBorder(Tk_3DBorder border) } - -declare 131 generic { - CONST84_RETURN char * Tk_NameOfAnchor (Tk_Anchor anchor) +declare 131 { + CONST84_RETURN char *Tk_NameOfAnchor(Tk_Anchor anchor) } - -declare 132 generic { - CONST84_RETURN char * Tk_NameOfBitmap (Display *display, Pixmap bitmap) +declare 132 { + CONST84_RETURN char *Tk_NameOfBitmap(Display *display, Pixmap bitmap) } - -declare 133 generic { - CONST84_RETURN char * Tk_NameOfCapStyle (int cap) +declare 133 { + CONST84_RETURN char *Tk_NameOfCapStyle(int cap) } - -declare 134 generic { - CONST84_RETURN char * Tk_NameOfColor (XColor *colorPtr) +declare 134 { + CONST84_RETURN char *Tk_NameOfColor(XColor *colorPtr) } - -declare 135 generic { - CONST84_RETURN char * Tk_NameOfCursor (Display *display, Tk_Cursor cursor) +declare 135 { + CONST84_RETURN char *Tk_NameOfCursor(Display *display, Tk_Cursor cursor) } - -declare 136 generic { - CONST84_RETURN char * Tk_NameOfFont (Tk_Font font) +declare 136 { + CONST84_RETURN char *Tk_NameOfFont(Tk_Font font) } - -declare 137 generic { - CONST84_RETURN char * Tk_NameOfImage (Tk_ImageMaster imageMaster) +declare 137 { + CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster imageMaster) } - -declare 138 generic { - CONST84_RETURN char * Tk_NameOfJoinStyle (int join) +declare 138 { + CONST84_RETURN char *Tk_NameOfJoinStyle(int join) } - -declare 139 generic { - CONST84_RETURN char * Tk_NameOfJustify (Tk_Justify justify) +declare 139 { + CONST84_RETURN char *Tk_NameOfJustify(Tk_Justify justify) } - -declare 140 generic { - CONST84_RETURN char * Tk_NameOfRelief (int relief) +declare 140 { + CONST84_RETURN char *Tk_NameOfRelief(int relief) } - -declare 141 generic { - Tk_Window Tk_NameToWindow (Tcl_Interp *interp, - CONST char *pathName, Tk_Window tkwin) +declare 141 { + Tk_Window Tk_NameToWindow(Tcl_Interp *interp, + const char *pathName, Tk_Window tkwin) } - -declare 142 generic { - void Tk_OwnSelection (Tk_Window tkwin, +declare 142 { + void Tk_OwnSelection(Tk_Window tkwin, Atom selection, Tk_LostSelProc *proc, ClientData clientData) } - -declare 143 generic { - int Tk_ParseArgv (Tcl_Interp *interp, +declare 143 { + int Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, Tk_ArgvInfo *argTable, int flags) } - -declare 144 generic { - void Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle, +declare 144 { + void Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height) } - -declare 145 generic { - void Tk_PhotoPutZoomedBlock_NoComposite (Tk_PhotoHandle handle, +declare 145 { + void Tk_PhotoPutZoomedBlock_NoComposite(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY) } - -declare 146 generic { - int Tk_PhotoGetImage (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr) +declare 146 { + int Tk_PhotoGetImage(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr) } - -declare 147 generic { - void Tk_PhotoBlank (Tk_PhotoHandle handle) +declare 147 { + void Tk_PhotoBlank(Tk_PhotoHandle handle) } - -declare 148 generic { - void Tk_PhotoExpand (Tk_PhotoHandle handle, int width, int height ) +declare 148 { + void Tk_PhotoExpand(Tk_PhotoHandle handle, int width, int height ) } - -declare 149 generic { - void Tk_PhotoGetSize (Tk_PhotoHandle handle, int *widthPtr, int *heightPtr) +declare 149 { + void Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr, int *heightPtr) } - -declare 150 generic { - void Tk_PhotoSetSize (Tk_PhotoHandle handle, int width, int height) +declare 150 { + void Tk_PhotoSetSize(Tk_PhotoHandle handle, int width, int height) } - -declare 151 generic { - int Tk_PointToChar (Tk_TextLayout layout, int x, int y) +declare 151 { + int Tk_PointToChar(Tk_TextLayout layout, int x, int y) } - -declare 152 generic { - int Tk_PostscriptFontName (Tk_Font tkfont, Tcl_DString *dsPtr) +declare 152 { + int Tk_PostscriptFontName(Tk_Font tkfont, Tcl_DString *dsPtr) } - -declare 153 generic { - void Tk_PreserveColormap (Display *display, Colormap colormap) +declare 153 { + void Tk_PreserveColormap(Display *display, Colormap colormap) } - -declare 154 generic { - void Tk_QueueWindowEvent (XEvent *eventPtr, Tcl_QueuePosition position) +declare 154 { + void Tk_QueueWindowEvent(XEvent *eventPtr, Tcl_QueuePosition position) } - -declare 155 generic { - void Tk_RedrawImage (Tk_Image image, int imageX, +declare 155 { + void Tk_RedrawImage(Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY) } - -declare 156 generic { - void Tk_ResizeWindow (Tk_Window tkwin, int width, int height) +declare 156 { + void Tk_ResizeWindow(Tk_Window tkwin, int width, int height) } - -declare 157 generic { - int Tk_RestackWindow (Tk_Window tkwin, int aboveBelow, Tk_Window other) +declare 157 { + int Tk_RestackWindow(Tk_Window tkwin, int aboveBelow, Tk_Window other) } - -declare 158 generic { - Tk_RestrictProc *Tk_RestrictEvents (Tk_RestrictProc *proc, +declare 158 { + Tk_RestrictProc *Tk_RestrictEvents(Tk_RestrictProc *proc, ClientData arg, ClientData *prevArgPtr) } - -declare 159 generic { - int Tk_SafeInit (Tcl_Interp *interp) +declare 159 { + int Tk_SafeInit(Tcl_Interp *interp) } - -declare 160 generic { - CONST char * Tk_SetAppName (Tk_Window tkwin, CONST char *name) +declare 160 { + const char *Tk_SetAppName(Tk_Window tkwin, const char *name) } - -declare 161 generic { - void Tk_SetBackgroundFromBorder (Tk_Window tkwin, Tk_3DBorder border) +declare 161 { + void Tk_SetBackgroundFromBorder(Tk_Window tkwin, Tk_3DBorder border) } - -declare 162 generic { - void Tk_SetClass (Tk_Window tkwin, CONST char *className) +declare 162 { + void Tk_SetClass(Tk_Window tkwin, const char *className) } - -declare 163 generic { - void Tk_SetGrid (Tk_Window tkwin, int reqWidth, int reqHeight, +declare 163 { + void Tk_SetGrid(Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight) } - -declare 164 generic { - void Tk_SetInternalBorder (Tk_Window tkwin, int width) +declare 164 { + void Tk_SetInternalBorder(Tk_Window tkwin, int width) } - -declare 165 generic { - void Tk_SetWindowBackground (Tk_Window tkwin, unsigned long pixel) +declare 165 { + void Tk_SetWindowBackground(Tk_Window tkwin, unsigned long pixel) } - -declare 166 generic { - void Tk_SetWindowBackgroundPixmap (Tk_Window tkwin, Pixmap pixmap) +declare 166 { + void Tk_SetWindowBackgroundPixmap(Tk_Window tkwin, Pixmap pixmap) } - -declare 167 generic { - void Tk_SetWindowBorder (Tk_Window tkwin, unsigned long pixel) +declare 167 { + void Tk_SetWindowBorder(Tk_Window tkwin, unsigned long pixel) } - -declare 168 generic { - void Tk_SetWindowBorderWidth (Tk_Window tkwin, int width) +declare 168 { + void Tk_SetWindowBorderWidth(Tk_Window tkwin, int width) } - -declare 169 generic { - void Tk_SetWindowBorderPixmap (Tk_Window tkwin, Pixmap pixmap) +declare 169 { + void Tk_SetWindowBorderPixmap(Tk_Window tkwin, Pixmap pixmap) } - -declare 170 generic { - void Tk_SetWindowColormap (Tk_Window tkwin, Colormap colormap) +declare 170 { + void Tk_SetWindowColormap(Tk_Window tkwin, Colormap colormap) } - -declare 171 generic { - int Tk_SetWindowVisual (Tk_Window tkwin, Visual *visual, int depth, +declare 171 { + int Tk_SetWindowVisual(Tk_Window tkwin, Visual *visual, int depth, Colormap colormap) } - -declare 172 generic { - void Tk_SizeOfBitmap (Display *display, Pixmap bitmap, int *widthPtr, +declare 172 { + void Tk_SizeOfBitmap(Display *display, Pixmap bitmap, int *widthPtr, int *heightPtr) } - -declare 173 generic { - void Tk_SizeOfImage (Tk_Image image, int *widthPtr, int *heightPtr) +declare 173 { + void Tk_SizeOfImage(Tk_Image image, int *widthPtr, int *heightPtr) } - -declare 174 generic { - int Tk_StrictMotif (Tk_Window tkwin) +declare 174 { + int Tk_StrictMotif(Tk_Window tkwin) } - -declare 175 generic { - void Tk_TextLayoutToPostscript (Tcl_Interp *interp, Tk_TextLayout layout) +declare 175 { + void Tk_TextLayoutToPostscript(Tcl_Interp *interp, Tk_TextLayout layout) } - -declare 176 generic { - int Tk_TextWidth (Tk_Font font, CONST char *str, int numBytes) +declare 176 { + int Tk_TextWidth(Tk_Font font, const char *str, int numBytes) } - -declare 177 generic { - void Tk_UndefineCursor (Tk_Window window) +declare 177 { + void Tk_UndefineCursor(Tk_Window window) } - -declare 178 generic { - void Tk_UnderlineChars (Display *display, +declare 178 { + void Tk_UnderlineChars(Display *display, Drawable drawable, GC gc, Tk_Font tkfont, - CONST char *source, int x, int y, int firstByte, + const char *source, int x, int y, int firstByte, int lastByte) } - -declare 179 generic { - void Tk_UnderlineTextLayout (Display *display, Drawable drawable, GC gc, +declare 179 { + void Tk_UnderlineTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline) } - -declare 180 generic { - void Tk_Ungrab (Tk_Window tkwin) +declare 180 { + void Tk_Ungrab(Tk_Window tkwin) } - -declare 181 generic { - void Tk_UnmaintainGeometry (Tk_Window slave, Tk_Window master) +declare 181 { + void Tk_UnmaintainGeometry(Tk_Window slave, Tk_Window master) } - -declare 182 generic { - void Tk_UnmapWindow (Tk_Window tkwin) +declare 182 { + void Tk_UnmapWindow(Tk_Window tkwin) } - -declare 183 generic { - void Tk_UnsetGrid (Tk_Window tkwin) +declare 183 { + void Tk_UnsetGrid(Tk_Window tkwin) } - -declare 184 generic { - void Tk_UpdatePointer (Tk_Window tkwin, int x, int y, int state) +declare 184 { + void Tk_UpdatePointer(Tk_Window tkwin, int x, int y, int state) } # new functions for 8.1 -declare 185 generic { - Pixmap Tk_AllocBitmapFromObj (Tcl_Interp *interp, Tk_Window tkwin, +declare 185 { + Pixmap Tk_AllocBitmapFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 186 generic { - Tk_3DBorder Tk_Alloc3DBorderFromObj (Tcl_Interp *interp, Tk_Window tkwin, +declare 186 { + Tk_3DBorder Tk_Alloc3DBorderFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 187 generic { - XColor * Tk_AllocColorFromObj (Tcl_Interp *interp, Tk_Window tkwin, +declare 187 { + XColor *Tk_AllocColorFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 188 generic { - Tk_Cursor Tk_AllocCursorFromObj (Tcl_Interp *interp, Tk_Window tkwin, +declare 188 { + Tk_Cursor Tk_AllocCursorFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 189 generic { - Tk_Font Tk_AllocFontFromObj (Tcl_Interp *interp, Tk_Window tkwin, +declare 189 { + Tk_Font Tk_AllocFontFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 190 generic { - Tk_OptionTable Tk_CreateOptionTable (Tcl_Interp *interp, - CONST Tk_OptionSpec *templatePtr) +declare 190 { + Tk_OptionTable Tk_CreateOptionTable(Tcl_Interp *interp, + const Tk_OptionSpec *templatePtr) } - -declare 191 generic { - void Tk_DeleteOptionTable (Tk_OptionTable optionTable) +declare 191 { + void Tk_DeleteOptionTable(Tk_OptionTable optionTable) } - -declare 192 generic { - void Tk_Free3DBorderFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 192 { + void Tk_Free3DBorderFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 193 generic { - void Tk_FreeBitmapFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 193 { + void Tk_FreeBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 194 generic { - void Tk_FreeColorFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 194 { + void Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 195 generic { - void Tk_FreeConfigOptions (char *recordPtr, Tk_OptionTable optionToken, +declare 195 { + void Tk_FreeConfigOptions(char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin) - } - -declare 196 generic { - void Tk_FreeSavedOptions (Tk_SavedOptions *savePtr) +declare 196 { + void Tk_FreeSavedOptions(Tk_SavedOptions *savePtr) } - -declare 197 generic { - void Tk_FreeCursorFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 197 { + void Tk_FreeCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 198 generic { - void Tk_FreeFontFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 198 { + void Tk_FreeFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 199 generic { - Tk_3DBorder Tk_Get3DBorderFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 199 { + Tk_3DBorder Tk_Get3DBorderFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 200 generic { - int Tk_GetAnchorFromObj (Tcl_Interp *interp, Tcl_Obj *objPtr, +declare 200 { + int Tk_GetAnchorFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Anchor *anchorPtr) } - -declare 201 generic { - Pixmap Tk_GetBitmapFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 201 { + Pixmap Tk_GetBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 202 generic { - XColor * Tk_GetColorFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 202 { + XColor *Tk_GetColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 203 generic { - Tk_Cursor Tk_GetCursorFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) +declare 203 { + Tk_Cursor Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - -declare 204 generic { - Tcl_Obj * Tk_GetOptionInfo (Tcl_Interp *interp, +declare 204 { + Tcl_Obj *Tk_GetOptionInfo(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin) } - -declare 205 generic { - Tcl_Obj * Tk_GetOptionValue (Tcl_Interp *interp, char *recordPtr, +declare 205 { + Tcl_Obj *Tk_GetOptionValue(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin) } - -declare 206 generic { - int Tk_GetJustifyFromObj (Tcl_Interp *interp, +declare 206 { + int Tk_GetJustifyFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Justify *justifyPtr) } - -declare 207 generic { - int Tk_GetMMFromObj (Tcl_Interp *interp, +declare 207 { + int Tk_GetMMFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr) } - -declare 208 generic { - int Tk_GetPixelsFromObj (Tcl_Interp *interp, +declare 208 { + int Tk_GetPixelsFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr) } - -declare 209 generic { - int Tk_GetReliefFromObj (Tcl_Interp *interp, +declare 209 { + int Tk_GetReliefFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr) } - -declare 210 generic { - int Tk_GetScrollInfoObj (Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], double *dblPtr, int *intPtr) +declare 210 { + int Tk_GetScrollInfoObj(Tcl_Interp *interp, + int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr) } - -declare 211 generic { - int Tk_InitOptions (Tcl_Interp *interp, char *recordPtr, +declare 211 { + int Tk_InitOptions(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin) } - -declare 212 generic { - void Tk_MainEx (int argc, char **argv, Tcl_AppInitProc *appInitProc, +declare 212 { + void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp) } - -declare 213 generic { - void Tk_RestoreSavedOptions (Tk_SavedOptions *savePtr) +declare 213 { + void Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr) } - -declare 214 generic { - int Tk_SetOptions (Tcl_Interp *interp, char *recordPtr, +declare 214 { + int Tk_SetOptions(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, - Tcl_Obj *CONST objv[], Tk_Window tkwin, + Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr) } - -declare 215 generic { - void Tk_InitConsoleChannels (Tcl_Interp *interp) +declare 215 { + void Tk_InitConsoleChannels(Tcl_Interp *interp) } - -declare 216 generic { - int Tk_CreateConsoleWindow (Tcl_Interp *interp) +declare 216 { + int Tk_CreateConsoleWindow(Tcl_Interp *interp) } - -declare 217 generic { - void Tk_CreateSmoothMethod (Tcl_Interp *interp, Tk_SmoothMethod *method) +declare 217 { + void Tk_CreateSmoothMethod(Tcl_Interp *interp, Tk_SmoothMethod *method) } - -#declare 218 generic { -# void Tk_CreateCanvasVisitor (Tcl_Interp *interp, VOID *typePtr) +#declare 218 { +# void Tk_CreateCanvasVisitor(Tcl_Interp *interp, void *typePtr) #} - -#declare 219 generic { -# VOID *Tk_GetCanvasVisitor (Tcl_Interp *interp, CONST char *name) +#declare 219 { +# void *Tk_GetCanvasVisitor(Tcl_Interp *interp, const char *name) #} - -declare 220 generic { - int Tk_GetDash (Tcl_Interp *interp, CONST char *value, Tk_Dash *dash) +declare 220 { + int Tk_GetDash(Tcl_Interp *interp, const char *value, Tk_Dash *dash) } -declare 221 generic { - void Tk_CreateOutline (Tk_Outline *outline) +declare 221 { + void Tk_CreateOutline(Tk_Outline *outline) } -declare 222 generic { - void Tk_DeleteOutline (Display *display, Tk_Outline *outline) +declare 222 { + void Tk_DeleteOutline(Display *display, Tk_Outline *outline) } -declare 223 generic { - int Tk_ConfigOutlineGC (XGCValues *gcValues, Tk_Canvas canvas, +declare 223 { + int Tk_ConfigOutlineGC(XGCValues *gcValues, Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } -declare 224 generic { - int Tk_ChangeOutlineGC (Tk_Canvas canvas, Tk_Item *item, +declare 224 { + int Tk_ChangeOutlineGC(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } -declare 225 generic { - int Tk_ResetOutlineGC (Tk_Canvas canvas, Tk_Item *item, +declare 225 { + int Tk_ResetOutlineGC(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } -declare 226 generic { - int Tk_CanvasPsOutline (Tk_Canvas canvas, Tk_Item *item, +declare 226 { + int Tk_CanvasPsOutline(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } -declare 227 generic { - void Tk_SetTSOrigin (Tk_Window tkwin, GC gc, int x, int y) +declare 227 { + void Tk_SetTSOrigin(Tk_Window tkwin, GC gc, int x, int y) } -declare 228 generic { - int Tk_CanvasGetCoordFromObj (Tcl_Interp *interp, Tk_Canvas canvas, +declare 228 { + int Tk_CanvasGetCoordFromObj(Tcl_Interp *interp, Tk_Canvas canvas, Tcl_Obj *obj, double *doublePtr) } -declare 229 generic { - void Tk_CanvasSetOffset (Tk_Canvas canvas, GC gc, Tk_TSOffset *offset) +declare 229 { + void Tk_CanvasSetOffset(Tk_Canvas canvas, GC gc, Tk_TSOffset *offset) } -declare 230 generic { - void Tk_DitherPhoto (Tk_PhotoHandle handle, int x, int y, int width, +declare 230 { + void Tk_DitherPhoto(Tk_PhotoHandle handle, int x, int y, int width, int height) } -declare 231 generic { - int Tk_PostscriptBitmap (Tcl_Interp *interp, Tk_Window tkwin, +declare 231 { + int Tk_PostscriptBitmap(Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap, int startX, int startY, int width, int height) } -declare 232 generic { - int Tk_PostscriptColor (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, +declare 232 { + int Tk_PostscriptColor(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, XColor *colorPtr) } -declare 233 generic { - int Tk_PostscriptFont (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, +declare 233 { + int Tk_PostscriptFont(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, Tk_Font font) } -declare 234 generic { - int Tk_PostscriptImage (Tk_Image image, Tcl_Interp *interp, +declare 234 { + int Tk_PostscriptImage(Tk_Image image, Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass) } -declare 235 generic { - void Tk_PostscriptPath (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, +declare 235 { + void Tk_PostscriptPath(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, double *coordPtr, int numPoints) } -declare 236 generic { - int Tk_PostscriptStipple (Tcl_Interp *interp, Tk_Window tkwin, +declare 236 { + int Tk_PostscriptStipple(Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap) } -declare 237 generic { - double Tk_PostscriptY (double y, Tk_PostscriptInfo psInfo) +declare 237 { + double Tk_PostscriptY(double y, Tk_PostscriptInfo psInfo) } -declare 238 generic { - int Tk_PostscriptPhoto (Tcl_Interp *interp, +declare 238 { + int Tk_PostscriptPhoto(Tcl_Interp *interp, Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, int width, int height) } # New in 8.4a1 # -declare 239 generic { - void Tk_CreateClientMessageHandler (Tk_ClientMessageProc *proc) +declare 239 { + void Tk_CreateClientMessageHandler(Tk_ClientMessageProc *proc) } -declare 240 generic { - void Tk_DeleteClientMessageHandler (Tk_ClientMessageProc *proc) +declare 240 { + void Tk_DeleteClientMessageHandler(Tk_ClientMessageProc *proc) } # New in 8.4a2 # -declare 241 generic { - Tk_Window Tk_CreateAnonymousWindow (Tcl_Interp *interp, - Tk_Window parent, CONST char *screenName) +declare 241 { + Tk_Window Tk_CreateAnonymousWindow(Tcl_Interp *interp, + Tk_Window parent, const char *screenName) } -declare 242 generic { - void Tk_SetClassProcs (Tk_Window tkwin, +declare 242 { + void Tk_SetClassProcs(Tk_Window tkwin, Tk_ClassProcs *procs, ClientData instanceData) } # New in 8.4a4 # -declare 243 generic { - void Tk_SetInternalBorderEx (Tk_Window tkwin, int left, int right, +declare 243 { + void Tk_SetInternalBorderEx(Tk_Window tkwin, int left, int right, int top, int bottom) } -declare 244 generic { - void Tk_SetMinimumRequestSize (Tk_Window tkwin, +declare 244 { + void Tk_SetMinimumRequestSize(Tk_Window tkwin, int minWidth, int minHeight) } # New in 8.4a5 # -declare 245 generic { - void Tk_SetCaretPos (Tk_Window tkwin, int x, int y, int height) +declare 245 { + void Tk_SetCaretPos(Tk_Window tkwin, int x, int y, int height) } - -declare 246 generic { - void Tk_PhotoPutBlock (Tk_PhotoHandle handle, +declare 246 { + void Tk_PhotoPutBlock(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule) } -declare 247 generic { - void Tk_PhotoPutZoomedBlock (Tk_PhotoHandle handle, +declare 247 { + void Tk_PhotoPutZoomedBlock(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule) } - -declare 248 generic { - int Tk_CollapseMotionEvents (Display *display, int collapse) +declare 248 { + int Tk_CollapseMotionEvents(Display *display, int collapse) } # Style engine -declare 249 generic { - Tk_StyleEngine Tk_RegisterStyleEngine (CONST char *name, +declare 249 { + Tk_StyleEngine Tk_RegisterStyleEngine(const char *name, Tk_StyleEngine parent) } -declare 250 generic { - Tk_StyleEngine Tk_GetStyleEngine (CONST char *name) +declare 250 { + Tk_StyleEngine Tk_GetStyleEngine(const char *name) } -declare 251 generic { - int Tk_RegisterStyledElement (Tk_StyleEngine engine, +declare 251 { + int Tk_RegisterStyledElement(Tk_StyleEngine engine, Tk_ElementSpec *templatePtr) } -declare 252 generic { - int Tk_GetElementId (CONST char *name) +declare 252 { + int Tk_GetElementId(const char *name) } -declare 253 generic { - Tk_Style Tk_CreateStyle (CONST char *name, Tk_StyleEngine engine, +declare 253 { + Tk_Style Tk_CreateStyle(const char *name, Tk_StyleEngine engine, ClientData clientData) } -declare 254 generic { - Tk_Style Tk_GetStyle (Tcl_Interp *interp, CONST char *name) +declare 254 { + Tk_Style Tk_GetStyle(Tcl_Interp *interp, const char *name) } -declare 255 generic { - void Tk_FreeStyle (Tk_Style style) +declare 255 { + void Tk_FreeStyle(Tk_Style style) } -declare 256 generic { - CONST char * Tk_NameOfStyle (Tk_Style style) +declare 256 { + const char *Tk_NameOfStyle(Tk_Style style) } -declare 257 generic { - Tk_Style Tk_AllocStyleFromObj (Tcl_Interp *interp, Tcl_Obj *objPtr) +declare 257 { + Tk_Style Tk_AllocStyleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr) } -declare 258 generic { - Tk_Style Tk_GetStyleFromObj (Tcl_Obj *objPtr) +declare 258 { + Tk_Style Tk_GetStyleFromObj(Tcl_Obj *objPtr) } -declare 259 generic { - void Tk_FreeStyleFromObj (Tcl_Obj *objPtr) +declare 259 { + void Tk_FreeStyleFromObj(Tcl_Obj *objPtr) } -declare 260 generic { - Tk_StyledElement Tk_GetStyledElement (Tk_Style style, int elementId, +declare 260 { + Tk_StyledElement Tk_GetStyledElement(Tk_Style style, int elementId, Tk_OptionTable optionTable) } -declare 261 generic { - void Tk_GetElementSize (Tk_Style style, Tk_StyledElement element, +declare 261 { + void Tk_GetElementSize(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr) } -declare 262 generic { - void Tk_GetElementBox (Tk_Style style, Tk_StyledElement element, +declare 262 { + void Tk_GetElementBox(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } -declare 263 generic { - int Tk_GetElementBorderWidth (Tk_Style style, Tk_StyledElement element, +declare 263 { + int Tk_GetElementBorderWidth(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin) } -declare 264 generic { - void Tk_DrawElement (Tk_Style style, Tk_StyledElement element, +declare 264 { + void Tk_DrawElement(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state) } @@ -1247,40 +1024,37 @@ declare 264 generic { interface tkPlat +################################ # Unix specific functions # (none) +################################ # Windows specific functions declare 0 win { - Window Tk_AttachHWND (Tk_Window tkwin, HWND hwnd) + Window Tk_AttachHWND(Tk_Window tkwin, HWND hwnd) } - declare 1 win { - HINSTANCE Tk_GetHINSTANCE (void) + HINSTANCE Tk_GetHINSTANCE(void) } - declare 2 win { - HWND Tk_GetHWND (Window window) + HWND Tk_GetHWND(Window window) } - declare 3 win { - Tk_Window Tk_HWNDToWindow (HWND hwnd) + Tk_Window Tk_HWNDToWindow(HWND hwnd) } - declare 4 win { - void Tk_PointerEvent (HWND hwnd, int x, int y) + void Tk_PointerEvent(HWND hwnd, int x, int y) } - declare 5 win { - int Tk_TranslateWinEvent (HWND hwnd, + int Tk_TranslateWinEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result) } # Mac specific functions declare 0 mac { - void Tk_MacSetEmbedHandler ( + void Tk_MacSetEmbedHandler( Tk_MacEmbedRegisterWinProc *registerWinProcPtr, Tk_MacEmbedGetGrafPortProc *getPortProcPtr, Tk_MacEmbedMakeContainerExistProc *containerExistProcPtr, @@ -1289,94 +1063,88 @@ declare 0 mac { } declare 1 mac { - void Tk_MacTurnOffMenus (void) + void Tk_MacTurnOffMenus(void) } declare 2 mac { - void Tk_MacTkOwnsCursor (int tkOwnsIt) + void Tk_MacTkOwnsCursor(int tkOwnsIt) } declare 3 mac { - void TkMacInitMenus (Tcl_Interp *interp) + void TkMacInitMenus(Tcl_Interp *interp) } declare 4 mac { - void TkMacInitAppleEvents (Tcl_Interp *interp) + void TkMacInitAppleEvents(Tcl_Interp *interp) } declare 5 mac { - int TkMacConvertEvent (EventRecord *eventPtr) + int TkMacConvertEvent(EventRecord *eventPtr) } declare 6 mac { - int TkMacConvertTkEvent (EventRecord *eventPtr, Window window) + int TkMacConvertTkEvent(EventRecord *eventPtr, Window window) } declare 7 mac { - void TkGenWMConfigureEvent (Tk_Window tkwin, + void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, int width, int height, int flags) } declare 8 mac { - void TkMacInvalClipRgns (TkWindow *winPtr) + void TkMacInvalClipRgns(TkWindow *winPtr) } declare 9 mac { - int TkMacHaveAppearance (void) + int TkMacHaveAppearance(void) } declare 10 mac { - GWorldPtr TkMacGetDrawablePort (Drawable drawable) + GWorldPtr TkMacGetDrawablePort(Drawable drawable) } # Mac OS X specific functions declare 0 aqua { - void Tk_MacOSXSetEmbedHandler ( \ - Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, \ - Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, \ - Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, \ - Tk_MacOSXEmbedGetClipProc *getClipProc, \ + void Tk_MacOSXSetEmbedHandler( + Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, + Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, + Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, + Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc) } - declare 1 aqua { - void Tk_MacOSXTurnOffMenus (void) + void Tk_MacOSXTurnOffMenus(void) } - declare 2 aqua { - void Tk_MacOSXTkOwnsCursor (int tkOwnsIt) + void Tk_MacOSXTkOwnsCursor(int tkOwnsIt) } - declare 3 aqua { - void TkMacOSXInitMenus (Tcl_Interp *interp) + void TkMacOSXInitMenus(Tcl_Interp *interp) } - declare 4 aqua { - void TkMacOSXInitAppleEvents (Tcl_Interp *interp) + void TkMacOSXInitAppleEvents(Tcl_Interp *interp) } - declare 5 aqua { - void TkGenWMConfigureEvent (Tk_Window tkwin, \ - int x, int y, int width, int height, int flags) + void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, int width, + int height, int flags) } - declare 6 aqua { - void TkMacOSXInvalClipRgns (Tk_Window tkwin) + void TkMacOSXInvalClipRgns(Tk_Window tkwin) } - declare 7 aqua { - GWorldPtr TkMacOSXGetDrawablePort (Drawable drawable) + GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable) } - declare 8 aqua { - ControlRef TkMacOSXGetRootControl (Drawable drawable) + ControlRef TkMacOSXGetRootControl(Drawable drawable) } - declare 9 aqua { - void Tk_MacOSXSetupTkNotifier (void) + void Tk_MacOSXSetupTkNotifier(void) } - declare 10 aqua { - int Tk_MacOSXIsAppInFront (void) + int Tk_MacOSXIsAppInFront(void) } + +# Local Variables: +# mode: tcl +# End: diff --git a/generic/tkDecls.h b/generic/tkDecls.h index 4584dac..81871a2 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -34,58 +34,58 @@ EXTERN void Tk_MainLoop _ANSI_ARGS_((void)); /* 1 */ EXTERN XColor * Tk_3DBorderColor _ANSI_ARGS_((Tk_3DBorder border)); /* 2 */ -EXTERN GC Tk_3DBorderGC _ANSI_ARGS_((Tk_Window tkwin, +EXTERN GC Tk_3DBorderGC _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 3 */ -EXTERN void Tk_3DHorizontalBevel _ANSI_ARGS_((Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, int x, - int y, int width, int height, int leftIn, +EXTERN void Tk_3DHorizontalBevel _ANSI_ARGS_((Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, int x, + int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief)); /* 4 */ -EXTERN void Tk_3DVerticalBevel _ANSI_ARGS_((Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, int x, - int y, int width, int height, int leftBevel, +EXTERN void Tk_3DVerticalBevel _ANSI_ARGS_((Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, int x, + int y, int width, int height, int leftBevel, int relief)); /* 5 */ -EXTERN void Tk_AddOption _ANSI_ARGS_((Tk_Window tkwin, - CONST char * name, CONST char * value, +EXTERN void Tk_AddOption _ANSI_ARGS_((Tk_Window tkwin, + CONST char *name, CONST char *value, int priority)); /* 6 */ EXTERN void Tk_BindEvent _ANSI_ARGS_(( - Tk_BindingTable bindingTable, - XEvent * eventPtr, Tk_Window tkwin, - int numObjects, ClientData * objectPtr)); + Tk_BindingTable bindingTable, + XEvent *eventPtr, Tk_Window tkwin, + int numObjects, ClientData *objectPtr)); /* 7 */ EXTERN void Tk_CanvasDrawableCoords _ANSI_ARGS_(( - Tk_Canvas canvas, double x, double y, - short * drawableXPtr, short * drawableYPtr)); + Tk_Canvas canvas, double x, double y, + short *drawableXPtr, short *drawableYPtr)); /* 8 */ EXTERN void Tk_CanvasEventuallyRedraw _ANSI_ARGS_(( - Tk_Canvas canvas, int x1, int y1, int x2, + Tk_Canvas canvas, int x1, int y1, int x2, int y2)); /* 9 */ -EXTERN int Tk_CanvasGetCoord _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Canvas canvas, CONST char * str, - double * doublePtr)); +EXTERN int Tk_CanvasGetCoord _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Canvas canvas, CONST char *str, + double *doublePtr)); /* 10 */ EXTERN Tk_CanvasTextInfo * Tk_CanvasGetTextInfo _ANSI_ARGS_(( Tk_Canvas canvas)); /* 11 */ -EXTERN int Tk_CanvasPsBitmap _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Canvas canvas, Pixmap bitmap, int x, +EXTERN int Tk_CanvasPsBitmap _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height)); /* 12 */ -EXTERN int Tk_CanvasPsColor _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Canvas canvas, XColor * colorPtr)); +EXTERN int Tk_CanvasPsColor _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Canvas canvas, XColor *colorPtr)); /* 13 */ -EXTERN int Tk_CanvasPsFont _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int Tk_CanvasPsFont _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, Tk_Font font)); /* 14 */ -EXTERN void Tk_CanvasPsPath _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Canvas canvas, double * coordPtr, +EXTERN void Tk_CanvasPsPath _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Canvas canvas, double *coordPtr, int numPoints)); /* 15 */ -EXTERN int Tk_CanvasPsStipple _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int Tk_CanvasPsStipple _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap)); /* 16 */ EXTERN double Tk_CanvasPsY _ANSI_ARGS_((Tk_Canvas canvas, double y)); @@ -94,122 +94,121 @@ EXTERN void Tk_CanvasSetStippleOrigin _ANSI_ARGS_(( Tk_Canvas canvas, GC gc)); /* 18 */ EXTERN int Tk_CanvasTagsParseProc _ANSI_ARGS_(( - ClientData clientData, Tcl_Interp * interp, - Tk_Window tkwin, CONST char * value, - char * widgRec, int offset)); + ClientData clientData, Tcl_Interp *interp, + Tk_Window tkwin, CONST char *value, + char *widgRec, int offset)); /* 19 */ EXTERN char * Tk_CanvasTagsPrintProc _ANSI_ARGS_(( - ClientData clientData, Tk_Window tkwin, - char * widgRec, int offset, - Tcl_FreeProc ** freeProcPtr)); + ClientData clientData, Tk_Window tkwin, + char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr)); /* 20 */ EXTERN Tk_Window Tk_CanvasTkwin _ANSI_ARGS_((Tk_Canvas canvas)); /* 21 */ -EXTERN void Tk_CanvasWindowCoords _ANSI_ARGS_((Tk_Canvas canvas, - double x, double y, short * screenXPtr, - short * screenYPtr)); +EXTERN void Tk_CanvasWindowCoords _ANSI_ARGS_((Tk_Canvas canvas, + double x, double y, short *screenXPtr, + short *screenYPtr)); /* 22 */ EXTERN void Tk_ChangeWindowAttributes _ANSI_ARGS_(( - Tk_Window tkwin, unsigned long valueMask, - XSetWindowAttributes * attsPtr)); + Tk_Window tkwin, unsigned long valueMask, + XSetWindowAttributes *attsPtr)); /* 23 */ -EXTERN int Tk_CharBbox _ANSI_ARGS_((Tk_TextLayout layout, - int index, int * xPtr, int * yPtr, - int * widthPtr, int * heightPtr)); +EXTERN int Tk_CharBbox _ANSI_ARGS_((Tk_TextLayout layout, + int index, int *xPtr, int *yPtr, + int *widthPtr, int *heightPtr)); /* 24 */ -EXTERN void Tk_ClearSelection _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_ClearSelection _ANSI_ARGS_((Tk_Window tkwin, Atom selection)); /* 25 */ -EXTERN int Tk_ClipboardAppend _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Atom target, Atom format, - char* buffer)); +EXTERN int Tk_ClipboardAppend _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Atom target, Atom format, + char *buffer)); /* 26 */ -EXTERN int Tk_ClipboardClear _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int Tk_ClipboardClear _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 27 */ -EXTERN int Tk_ConfigureInfo _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Tk_ConfigSpec * specs, - char * widgRec, CONST char * argvName, +EXTERN int Tk_ConfigureInfo _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tk_ConfigSpec *specs, + char *widgRec, CONST char *argvName, int flags)); /* 28 */ -EXTERN int Tk_ConfigureValue _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Tk_ConfigSpec * specs, - char * widgRec, CONST char * argvName, +EXTERN int Tk_ConfigureValue _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tk_ConfigSpec *specs, + char *widgRec, CONST char *argvName, int flags)); /* 29 */ -EXTERN int Tk_ConfigureWidget _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Tk_ConfigSpec * specs, - int argc, CONST84 char ** argv, - char * widgRec, int flags)); +EXTERN int Tk_ConfigureWidget _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tk_ConfigSpec *specs, + int argc, CONST84 char **argv, char *widgRec, + int flags)); /* 30 */ -EXTERN void Tk_ConfigureWindow _ANSI_ARGS_((Tk_Window tkwin, - unsigned int valueMask, - XWindowChanges * valuePtr)); +EXTERN void Tk_ConfigureWindow _ANSI_ARGS_((Tk_Window tkwin, + unsigned int valueMask, + XWindowChanges *valuePtr)); /* 31 */ -EXTERN Tk_TextLayout Tk_ComputeTextLayout _ANSI_ARGS_((Tk_Font font, - CONST char * str, int numChars, - int wrapLength, Tk_Justify justify, - int flags, int * widthPtr, int * heightPtr)); +EXTERN Tk_TextLayout Tk_ComputeTextLayout _ANSI_ARGS_((Tk_Font font, + CONST char *str, int numChars, + int wrapLength, Tk_Justify justify, + int flags, int *widthPtr, int *heightPtr)); /* 32 */ -EXTERN Tk_Window Tk_CoordsToWindow _ANSI_ARGS_((int rootX, int rootY, +EXTERN Tk_Window Tk_CoordsToWindow _ANSI_ARGS_((int rootX, int rootY, Tk_Window tkwin)); /* 33 */ -EXTERN unsigned long Tk_CreateBinding _ANSI_ARGS_((Tcl_Interp * interp, - Tk_BindingTable bindingTable, - ClientData object, CONST char * eventStr, - CONST char * command, int append)); +EXTERN unsigned long Tk_CreateBinding _ANSI_ARGS_((Tcl_Interp *interp, + Tk_BindingTable bindingTable, + ClientData object, CONST char *eventStr, + CONST char *script, int append)); /* 34 */ EXTERN Tk_BindingTable Tk_CreateBindingTable _ANSI_ARGS_(( - Tcl_Interp * interp)); + Tcl_Interp *interp)); /* 35 */ -EXTERN Tk_ErrorHandler Tk_CreateErrorHandler _ANSI_ARGS_((Display * display, - int errNum, int request, int minorCode, - Tk_ErrorProc * errorProc, +EXTERN Tk_ErrorHandler Tk_CreateErrorHandler _ANSI_ARGS_((Display *display, + int errNum, int request, int minorCode, + Tk_ErrorProc *errorProc, ClientData clientData)); /* 36 */ -EXTERN void Tk_CreateEventHandler _ANSI_ARGS_((Tk_Window token, - unsigned long mask, Tk_EventProc * proc, +EXTERN void Tk_CreateEventHandler _ANSI_ARGS_((Tk_Window token, + unsigned long mask, Tk_EventProc *proc, ClientData clientData)); /* 37 */ EXTERN void Tk_CreateGenericHandler _ANSI_ARGS_(( - Tk_GenericProc * proc, ClientData clientData)); + Tk_GenericProc *proc, ClientData clientData)); /* 38 */ EXTERN void Tk_CreateImageType _ANSI_ARGS_(( - Tk_ImageType * typePtr)); + Tk_ImageType *typePtr)); /* 39 */ -EXTERN void Tk_CreateItemType _ANSI_ARGS_((Tk_ItemType * typePtr)); +EXTERN void Tk_CreateItemType _ANSI_ARGS_((Tk_ItemType *typePtr)); /* 40 */ EXTERN void Tk_CreatePhotoImageFormat _ANSI_ARGS_(( - Tk_PhotoImageFormat * formatPtr)); + Tk_PhotoImageFormat *formatPtr)); /* 41 */ -EXTERN void Tk_CreateSelHandler _ANSI_ARGS_((Tk_Window tkwin, - Atom selection, Atom target, - Tk_SelectionProc * proc, +EXTERN void Tk_CreateSelHandler _ANSI_ARGS_((Tk_Window tkwin, + Atom selection, Atom target, + Tk_SelectionProc *proc, ClientData clientData, Atom format)); /* 42 */ -EXTERN Tk_Window Tk_CreateWindow _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window parent, CONST char * name, - CONST char * screenName)); +EXTERN Tk_Window Tk_CreateWindow _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window parent, CONST char *name, + CONST char *screenName)); /* 43 */ EXTERN Tk_Window Tk_CreateWindowFromPath _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window tkwin, - CONST char * pathName, - CONST char * screenName)); + Tcl_Interp *interp, Tk_Window tkwin, + CONST char *pathName, CONST char *screenName)); /* 44 */ -EXTERN int Tk_DefineBitmap _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * name, CONST char * source, +EXTERN int Tk_DefineBitmap _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *name, CONST char *source, int width, int height)); /* 45 */ -EXTERN void Tk_DefineCursor _ANSI_ARGS_((Tk_Window window, +EXTERN void Tk_DefineCursor _ANSI_ARGS_((Tk_Window window, Tk_Cursor cursor)); /* 46 */ EXTERN void Tk_DeleteAllBindings _ANSI_ARGS_(( - Tk_BindingTable bindingTable, + Tk_BindingTable bindingTable, ClientData object)); /* 47 */ -EXTERN int Tk_DeleteBinding _ANSI_ARGS_((Tcl_Interp * interp, - Tk_BindingTable bindingTable, - ClientData object, CONST char * eventStr)); +EXTERN int Tk_DeleteBinding _ANSI_ARGS_((Tcl_Interp *interp, + Tk_BindingTable bindingTable, + ClientData object, CONST char *eventStr)); /* 48 */ EXTERN void Tk_DeleteBindingTable _ANSI_ARGS_(( Tk_BindingTable bindingTable)); @@ -217,17 +216,17 @@ EXTERN void Tk_DeleteBindingTable _ANSI_ARGS_(( EXTERN void Tk_DeleteErrorHandler _ANSI_ARGS_(( Tk_ErrorHandler handler)); /* 50 */ -EXTERN void Tk_DeleteEventHandler _ANSI_ARGS_((Tk_Window token, - unsigned long mask, Tk_EventProc * proc, +EXTERN void Tk_DeleteEventHandler _ANSI_ARGS_((Tk_Window token, + unsigned long mask, Tk_EventProc *proc, ClientData clientData)); /* 51 */ EXTERN void Tk_DeleteGenericHandler _ANSI_ARGS_(( - Tk_GenericProc * proc, ClientData clientData)); + Tk_GenericProc *proc, ClientData clientData)); /* 52 */ -EXTERN void Tk_DeleteImage _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * name)); +EXTERN void Tk_DeleteImage _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *name)); /* 53 */ -EXTERN void Tk_DeleteSelHandler _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_DeleteSelHandler _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Atom target)); /* 54 */ EXTERN void Tk_DestroyWindow _ANSI_ARGS_((Tk_Window tkwin)); @@ -237,241 +236,239 @@ EXTERN CONST84_RETURN char * Tk_DisplayName _ANSI_ARGS_((Tk_Window tkwin)); EXTERN int Tk_DistanceToTextLayout _ANSI_ARGS_(( Tk_TextLayout layout, int x, int y)); /* 57 */ -EXTERN void Tk_Draw3DPolygon _ANSI_ARGS_((Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, - XPoint * pointPtr, int numPoints, +EXTERN void Tk_Draw3DPolygon _ANSI_ARGS_((Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, + XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief)); /* 58 */ -EXTERN void Tk_Draw3DRectangle _ANSI_ARGS_((Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, int x, - int y, int width, int height, +EXTERN void Tk_Draw3DRectangle _ANSI_ARGS_((Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, int x, + int y, int width, int height, int borderWidth, int relief)); /* 59 */ -EXTERN void Tk_DrawChars _ANSI_ARGS_((Display * display, - Drawable drawable, GC gc, Tk_Font tkfont, - CONST char * source, int numBytes, int x, +EXTERN void Tk_DrawChars _ANSI_ARGS_((Display *display, + Drawable drawable, GC gc, Tk_Font tkfont, + CONST char *source, int numBytes, int x, int y)); /* 60 */ -EXTERN void Tk_DrawFocusHighlight _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_DrawFocusHighlight _ANSI_ARGS_((Tk_Window tkwin, GC gc, int width, Drawable drawable)); /* 61 */ -EXTERN void Tk_DrawTextLayout _ANSI_ARGS_((Display * display, - Drawable drawable, GC gc, - Tk_TextLayout layout, int x, int y, +EXTERN void Tk_DrawTextLayout _ANSI_ARGS_((Display *display, + Drawable drawable, GC gc, + Tk_TextLayout layout, int x, int y, int firstChar, int lastChar)); /* 62 */ -EXTERN void Tk_Fill3DPolygon _ANSI_ARGS_((Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, - XPoint * pointPtr, int numPoints, +EXTERN void Tk_Fill3DPolygon _ANSI_ARGS_((Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, + XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief)); /* 63 */ -EXTERN void Tk_Fill3DRectangle _ANSI_ARGS_((Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, int x, - int y, int width, int height, +EXTERN void Tk_Fill3DRectangle _ANSI_ARGS_((Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, int x, + int y, int width, int height, int borderWidth, int relief)); /* 64 */ -EXTERN Tk_PhotoHandle Tk_FindPhoto _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * imageName)); +EXTERN Tk_PhotoHandle Tk_FindPhoto _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *imageName)); /* 65 */ EXTERN Font Tk_FontId _ANSI_ARGS_((Tk_Font font)); /* 66 */ EXTERN void Tk_Free3DBorder _ANSI_ARGS_((Tk_3DBorder border)); /* 67 */ -EXTERN void Tk_FreeBitmap _ANSI_ARGS_((Display * display, +EXTERN void Tk_FreeBitmap _ANSI_ARGS_((Display *display, Pixmap bitmap)); /* 68 */ -EXTERN void Tk_FreeColor _ANSI_ARGS_((XColor * colorPtr)); +EXTERN void Tk_FreeColor _ANSI_ARGS_((XColor *colorPtr)); /* 69 */ -EXTERN void Tk_FreeColormap _ANSI_ARGS_((Display * display, +EXTERN void Tk_FreeColormap _ANSI_ARGS_((Display *display, Colormap colormap)); /* 70 */ -EXTERN void Tk_FreeCursor _ANSI_ARGS_((Display * display, +EXTERN void Tk_FreeCursor _ANSI_ARGS_((Display *display, Tk_Cursor cursor)); /* 71 */ EXTERN void Tk_FreeFont _ANSI_ARGS_((Tk_Font f)); /* 72 */ -EXTERN void Tk_FreeGC _ANSI_ARGS_((Display * display, GC gc)); +EXTERN void Tk_FreeGC _ANSI_ARGS_((Display *display, GC gc)); /* 73 */ EXTERN void Tk_FreeImage _ANSI_ARGS_((Tk_Image image)); /* 74 */ -EXTERN void Tk_FreeOptions _ANSI_ARGS_((Tk_ConfigSpec * specs, - char * widgRec, Display * display, +EXTERN void Tk_FreeOptions _ANSI_ARGS_((Tk_ConfigSpec *specs, + char *widgRec, Display *display, int needFlags)); /* 75 */ -EXTERN void Tk_FreePixmap _ANSI_ARGS_((Display * display, +EXTERN void Tk_FreePixmap _ANSI_ARGS_((Display *display, Pixmap pixmap)); /* 76 */ EXTERN void Tk_FreeTextLayout _ANSI_ARGS_(( Tk_TextLayout textLayout)); /* 77 */ -EXTERN void Tk_FreeXId _ANSI_ARGS_((Display * display, XID xid)); +EXTERN void Tk_FreeXId _ANSI_ARGS_((Display *display, XID xid)); /* 78 */ -EXTERN GC Tk_GCForColor _ANSI_ARGS_((XColor * colorPtr, +EXTERN GC Tk_GCForColor _ANSI_ARGS_((XColor *colorPtr, Drawable drawable)); /* 79 */ -EXTERN void Tk_GeometryRequest _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_GeometryRequest _ANSI_ARGS_((Tk_Window tkwin, int reqWidth, int reqHeight)); /* 80 */ -EXTERN Tk_3DBorder Tk_Get3DBorder _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN Tk_3DBorder Tk_Get3DBorder _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName)); /* 81 */ -EXTERN void Tk_GetAllBindings _ANSI_ARGS_((Tcl_Interp * interp, - Tk_BindingTable bindingTable, +EXTERN void Tk_GetAllBindings _ANSI_ARGS_((Tcl_Interp *interp, + Tk_BindingTable bindingTable, ClientData object)); /* 82 */ -EXTERN int Tk_GetAnchor _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * str, Tk_Anchor * anchorPtr)); +EXTERN int Tk_GetAnchor _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *str, Tk_Anchor *anchorPtr)); /* 83 */ -EXTERN CONST84_RETURN char * Tk_GetAtomName _ANSI_ARGS_((Tk_Window tkwin, +EXTERN CONST84_RETURN char * Tk_GetAtomName _ANSI_ARGS_((Tk_Window tkwin, Atom atom)); /* 84 */ -EXTERN CONST84_RETURN char * Tk_GetBinding _ANSI_ARGS_((Tcl_Interp * interp, - Tk_BindingTable bindingTable, - ClientData object, CONST char * eventStr)); +EXTERN CONST84_RETURN char * Tk_GetBinding _ANSI_ARGS_((Tcl_Interp *interp, + Tk_BindingTable bindingTable, + ClientData object, CONST char *eventStr)); /* 85 */ -EXTERN Pixmap Tk_GetBitmap _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, CONST char * str)); +EXTERN Pixmap Tk_GetBitmap _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *str)); /* 86 */ -EXTERN Pixmap Tk_GetBitmapFromData _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window tkwin, - CONST char * source, int width, int height)); +EXTERN Pixmap Tk_GetBitmapFromData _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *source, + int width, int height)); /* 87 */ -EXTERN int Tk_GetCapStyle _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * str, int * capPtr)); +EXTERN int Tk_GetCapStyle _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *str, int *capPtr)); /* 88 */ -EXTERN XColor * Tk_GetColor _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN XColor * Tk_GetColor _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name)); /* 89 */ -EXTERN XColor * Tk_GetColorByValue _ANSI_ARGS_((Tk_Window tkwin, - XColor * colorPtr)); +EXTERN XColor * Tk_GetColorByValue _ANSI_ARGS_((Tk_Window tkwin, + XColor *colorPtr)); /* 90 */ -EXTERN Colormap Tk_GetColormap _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, CONST char * str)); +EXTERN Colormap Tk_GetColormap _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *str)); /* 91 */ -EXTERN Tk_Cursor Tk_GetCursor _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN Tk_Cursor Tk_GetCursor _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str)); /* 92 */ -EXTERN Tk_Cursor Tk_GetCursorFromData _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window tkwin, - CONST char * source, CONST char * mask, - int width, int height, int xHot, int yHot, - Tk_Uid fg, Tk_Uid bg)); +EXTERN Tk_Cursor Tk_GetCursorFromData _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *source, + CONST char *mask, int width, int height, + int xHot, int yHot, Tk_Uid fg, Tk_Uid bg)); /* 93 */ -EXTERN Tk_Font Tk_GetFont _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, CONST char * str)); +EXTERN Tk_Font Tk_GetFont _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *str)); /* 94 */ -EXTERN Tk_Font Tk_GetFontFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN Tk_Font Tk_GetFontFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 95 */ -EXTERN void Tk_GetFontMetrics _ANSI_ARGS_((Tk_Font font, - Tk_FontMetrics * fmPtr)); +EXTERN void Tk_GetFontMetrics _ANSI_ARGS_((Tk_Font font, + Tk_FontMetrics *fmPtr)); /* 96 */ -EXTERN GC Tk_GetGC _ANSI_ARGS_((Tk_Window tkwin, - unsigned long valueMask, - XGCValues * valuePtr)); +EXTERN GC Tk_GetGC _ANSI_ARGS_((Tk_Window tkwin, + unsigned long valueMask, XGCValues *valuePtr)); /* 97 */ -EXTERN Tk_Image Tk_GetImage _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, CONST char * name, - Tk_ImageChangedProc * changeProc, +EXTERN Tk_Image Tk_GetImage _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *name, + Tk_ImageChangedProc *changeProc, ClientData clientData)); /* 98 */ EXTERN ClientData Tk_GetImageMasterData _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * name, - Tk_ImageType ** typePtrPtr)); + Tcl_Interp *interp, CONST char *name, + Tk_ImageType **typePtrPtr)); /* 99 */ EXTERN Tk_ItemType * Tk_GetItemTypes _ANSI_ARGS_((void)); /* 100 */ -EXTERN int Tk_GetJoinStyle _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * str, int * joinPtr)); +EXTERN int Tk_GetJoinStyle _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *str, int *joinPtr)); /* 101 */ -EXTERN int Tk_GetJustify _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * str, Tk_Justify * justifyPtr)); +EXTERN int Tk_GetJustify _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *str, Tk_Justify *justifyPtr)); /* 102 */ EXTERN int Tk_GetNumMainWindows _ANSI_ARGS_((void)); /* 103 */ -EXTERN Tk_Uid Tk_GetOption _ANSI_ARGS_((Tk_Window tkwin, - CONST char * name, CONST char * className)); +EXTERN Tk_Uid Tk_GetOption _ANSI_ARGS_((Tk_Window tkwin, + CONST char *name, CONST char *className)); /* 104 */ -EXTERN int Tk_GetPixels _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, CONST char * str, - int * intPtr)); +EXTERN int Tk_GetPixels _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *str, + int *intPtr)); /* 105 */ -EXTERN Pixmap Tk_GetPixmap _ANSI_ARGS_((Display * display, +EXTERN Pixmap Tk_GetPixmap _ANSI_ARGS_((Display *display, Drawable d, int width, int height, int depth)); /* 106 */ -EXTERN int Tk_GetRelief _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * name, int * reliefPtr)); +EXTERN int Tk_GetRelief _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *name, int *reliefPtr)); /* 107 */ -EXTERN void Tk_GetRootCoords _ANSI_ARGS_((Tk_Window tkwin, - int * xPtr, int * yPtr)); +EXTERN void Tk_GetRootCoords _ANSI_ARGS_((Tk_Window tkwin, + int *xPtr, int *yPtr)); /* 108 */ -EXTERN int Tk_GetScrollInfo _ANSI_ARGS_((Tcl_Interp * interp, - int argc, CONST84 char ** argv, - double * dblPtr, int * intPtr)); +EXTERN int Tk_GetScrollInfo _ANSI_ARGS_((Tcl_Interp *interp, + int argc, CONST84 char **argv, + double *dblPtr, int *intPtr)); /* 109 */ -EXTERN int Tk_GetScreenMM _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, CONST char * str, - double * doublePtr)); +EXTERN int Tk_GetScreenMM _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *str, + double *doublePtr)); /* 110 */ -EXTERN int Tk_GetSelection _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Atom selection, Atom target, - Tk_GetSelProc * proc, ClientData clientData)); +EXTERN int Tk_GetSelection _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Atom selection, Atom target, + Tk_GetSelProc *proc, ClientData clientData)); /* 111 */ -EXTERN Tk_Uid Tk_GetUid _ANSI_ARGS_((CONST char * str)); +EXTERN Tk_Uid Tk_GetUid _ANSI_ARGS_((CONST char *str)); /* 112 */ -EXTERN Visual * Tk_GetVisual _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, CONST char * str, - int * depthPtr, Colormap * colormapPtr)); +EXTERN Visual * Tk_GetVisual _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *str, + int *depthPtr, Colormap *colormapPtr)); /* 113 */ -EXTERN void Tk_GetVRootGeometry _ANSI_ARGS_((Tk_Window tkwin, - int * xPtr, int * yPtr, int * widthPtr, - int * heightPtr)); +EXTERN void Tk_GetVRootGeometry _ANSI_ARGS_((Tk_Window tkwin, + int *xPtr, int *yPtr, int *widthPtr, + int *heightPtr)); /* 114 */ -EXTERN int Tk_Grab _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int Tk_Grab _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal)); /* 115 */ -EXTERN void Tk_HandleEvent _ANSI_ARGS_((XEvent * eventPtr)); +EXTERN void Tk_HandleEvent _ANSI_ARGS_((XEvent *eventPtr)); /* 116 */ -EXTERN Tk_Window Tk_IdToWindow _ANSI_ARGS_((Display * display, +EXTERN Tk_Window Tk_IdToWindow _ANSI_ARGS_((Display *display, Window window)); /* 117 */ -EXTERN void Tk_ImageChanged _ANSI_ARGS_((Tk_ImageMaster master, - int x, int y, int width, int height, +EXTERN void Tk_ImageChanged _ANSI_ARGS_((Tk_ImageMaster master, + int x, int y, int width, int height, int imageWidth, int imageHeight)); /* 118 */ -EXTERN int Tk_Init _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN int Tk_Init _ANSI_ARGS_((Tcl_Interp *interp)); /* 119 */ -EXTERN Atom Tk_InternAtom _ANSI_ARGS_((Tk_Window tkwin, - CONST char * name)); +EXTERN Atom Tk_InternAtom _ANSI_ARGS_((Tk_Window tkwin, + CONST char *name)); /* 120 */ EXTERN int Tk_IntersectTextLayout _ANSI_ARGS_(( - Tk_TextLayout layout, int x, int y, + Tk_TextLayout layout, int x, int y, int width, int height)); /* 121 */ -EXTERN void Tk_MaintainGeometry _ANSI_ARGS_((Tk_Window slave, - Tk_Window master, int x, int y, int width, +EXTERN void Tk_MaintainGeometry _ANSI_ARGS_((Tk_Window slave, + Tk_Window master, int x, int y, int width, int height)); /* 122 */ -EXTERN Tk_Window Tk_MainWindow _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN Tk_Window Tk_MainWindow _ANSI_ARGS_((Tcl_Interp *interp)); /* 123 */ EXTERN void Tk_MakeWindowExist _ANSI_ARGS_((Tk_Window tkwin)); /* 124 */ -EXTERN void Tk_ManageGeometry _ANSI_ARGS_((Tk_Window tkwin, - Tk_GeomMgr * mgrPtr, ClientData clientData)); +EXTERN void Tk_ManageGeometry _ANSI_ARGS_((Tk_Window tkwin, + Tk_GeomMgr *mgrPtr, ClientData clientData)); /* 125 */ EXTERN void Tk_MapWindow _ANSI_ARGS_((Tk_Window tkwin)); /* 126 */ -EXTERN int Tk_MeasureChars _ANSI_ARGS_((Tk_Font tkfont, - CONST char * source, int numBytes, - int maxPixels, int flags, int * lengthPtr)); +EXTERN int Tk_MeasureChars _ANSI_ARGS_((Tk_Font tkfont, + CONST char *source, int numBytes, + int maxPixels, int flags, int *lengthPtr)); /* 127 */ -EXTERN void Tk_MoveResizeWindow _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_MoveResizeWindow _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height)); /* 128 */ -EXTERN void Tk_MoveWindow _ANSI_ARGS_((Tk_Window tkwin, int x, +EXTERN void Tk_MoveWindow _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 129 */ -EXTERN void Tk_MoveToplevelWindow _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_MoveToplevelWindow _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 130 */ EXTERN CONST84_RETURN char * Tk_NameOf3DBorder _ANSI_ARGS_(( @@ -479,14 +476,14 @@ EXTERN CONST84_RETURN char * Tk_NameOf3DBorder _ANSI_ARGS_(( /* 131 */ EXTERN CONST84_RETURN char * Tk_NameOfAnchor _ANSI_ARGS_((Tk_Anchor anchor)); /* 132 */ -EXTERN CONST84_RETURN char * Tk_NameOfBitmap _ANSI_ARGS_((Display * display, +EXTERN CONST84_RETURN char * Tk_NameOfBitmap _ANSI_ARGS_((Display *display, Pixmap bitmap)); /* 133 */ EXTERN CONST84_RETURN char * Tk_NameOfCapStyle _ANSI_ARGS_((int cap)); /* 134 */ -EXTERN CONST84_RETURN char * Tk_NameOfColor _ANSI_ARGS_((XColor * colorPtr)); +EXTERN CONST84_RETURN char * Tk_NameOfColor _ANSI_ARGS_((XColor *colorPtr)); /* 135 */ -EXTERN CONST84_RETURN char * Tk_NameOfCursor _ANSI_ARGS_((Display * display, +EXTERN CONST84_RETURN char * Tk_NameOfCursor _ANSI_ARGS_((Display *display, Tk_Cursor cursor)); /* 136 */ EXTERN CONST84_RETURN char * Tk_NameOfFont _ANSI_ARGS_((Tk_Font font)); @@ -501,418 +498,412 @@ EXTERN CONST84_RETURN char * Tk_NameOfJustify _ANSI_ARGS_(( /* 140 */ EXTERN CONST84_RETURN char * Tk_NameOfRelief _ANSI_ARGS_((int relief)); /* 141 */ -EXTERN Tk_Window Tk_NameToWindow _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * pathName, Tk_Window tkwin)); +EXTERN Tk_Window Tk_NameToWindow _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *pathName, Tk_Window tkwin)); /* 142 */ -EXTERN void Tk_OwnSelection _ANSI_ARGS_((Tk_Window tkwin, - Atom selection, Tk_LostSelProc * proc, +EXTERN void Tk_OwnSelection _ANSI_ARGS_((Tk_Window tkwin, + Atom selection, Tk_LostSelProc *proc, ClientData clientData)); /* 143 */ -EXTERN int Tk_ParseArgv _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, int * argcPtr, - CONST84 char ** argv, Tk_ArgvInfo * argTable, +EXTERN int Tk_ParseArgv _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, int *argcPtr, + CONST84 char **argv, Tk_ArgvInfo *argTable, int flags)); /* 144 */ EXTERN void Tk_PhotoPutBlock_NoComposite _ANSI_ARGS_(( - Tk_PhotoHandle handle, - Tk_PhotoImageBlock * blockPtr, int x, int y, + Tk_PhotoHandle handle, + Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height)); /* 145 */ EXTERN void Tk_PhotoPutZoomedBlock_NoComposite _ANSI_ARGS_(( - Tk_PhotoHandle handle, - Tk_PhotoImageBlock * blockPtr, int x, int y, - int width, int height, int zoomX, int zoomY, + Tk_PhotoHandle handle, + Tk_PhotoImageBlock *blockPtr, int x, int y, + int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY)); /* 146 */ -EXTERN int Tk_PhotoGetImage _ANSI_ARGS_((Tk_PhotoHandle handle, - Tk_PhotoImageBlock * blockPtr)); +EXTERN int Tk_PhotoGetImage _ANSI_ARGS_((Tk_PhotoHandle handle, + Tk_PhotoImageBlock *blockPtr)); /* 147 */ EXTERN void Tk_PhotoBlank _ANSI_ARGS_((Tk_PhotoHandle handle)); /* 148 */ -EXTERN void Tk_PhotoExpand _ANSI_ARGS_((Tk_PhotoHandle handle, +EXTERN void Tk_PhotoExpand _ANSI_ARGS_((Tk_PhotoHandle handle, int width, int height)); /* 149 */ -EXTERN void Tk_PhotoGetSize _ANSI_ARGS_((Tk_PhotoHandle handle, - int * widthPtr, int * heightPtr)); +EXTERN void Tk_PhotoGetSize _ANSI_ARGS_((Tk_PhotoHandle handle, + int *widthPtr, int *heightPtr)); /* 150 */ -EXTERN void Tk_PhotoSetSize _ANSI_ARGS_((Tk_PhotoHandle handle, +EXTERN void Tk_PhotoSetSize _ANSI_ARGS_((Tk_PhotoHandle handle, int width, int height)); /* 151 */ -EXTERN int Tk_PointToChar _ANSI_ARGS_((Tk_TextLayout layout, +EXTERN int Tk_PointToChar _ANSI_ARGS_((Tk_TextLayout layout, int x, int y)); /* 152 */ -EXTERN int Tk_PostscriptFontName _ANSI_ARGS_((Tk_Font tkfont, - Tcl_DString * dsPtr)); +EXTERN int Tk_PostscriptFontName _ANSI_ARGS_((Tk_Font tkfont, + Tcl_DString *dsPtr)); /* 153 */ -EXTERN void Tk_PreserveColormap _ANSI_ARGS_((Display * display, +EXTERN void Tk_PreserveColormap _ANSI_ARGS_((Display *display, Colormap colormap)); /* 154 */ -EXTERN void Tk_QueueWindowEvent _ANSI_ARGS_((XEvent * eventPtr, +EXTERN void Tk_QueueWindowEvent _ANSI_ARGS_((XEvent *eventPtr, Tcl_QueuePosition position)); /* 155 */ -EXTERN void Tk_RedrawImage _ANSI_ARGS_((Tk_Image image, - int imageX, int imageY, int width, - int height, Drawable drawable, int drawableX, +EXTERN void Tk_RedrawImage _ANSI_ARGS_((Tk_Image image, + int imageX, int imageY, int width, + int height, Drawable drawable, int drawableX, int drawableY)); /* 156 */ -EXTERN void Tk_ResizeWindow _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_ResizeWindow _ANSI_ARGS_((Tk_Window tkwin, int width, int height)); /* 157 */ -EXTERN int Tk_RestackWindow _ANSI_ARGS_((Tk_Window tkwin, +EXTERN int Tk_RestackWindow _ANSI_ARGS_((Tk_Window tkwin, int aboveBelow, Tk_Window other)); /* 158 */ EXTERN Tk_RestrictProc * Tk_RestrictEvents _ANSI_ARGS_(( - Tk_RestrictProc * proc, ClientData arg, - ClientData * prevArgPtr)); + Tk_RestrictProc *proc, ClientData arg, + ClientData *prevArgPtr)); /* 159 */ -EXTERN int Tk_SafeInit _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN int Tk_SafeInit _ANSI_ARGS_((Tcl_Interp *interp)); /* 160 */ -EXTERN CONST char * Tk_SetAppName _ANSI_ARGS_((Tk_Window tkwin, - CONST char * name)); +EXTERN CONST char * Tk_SetAppName _ANSI_ARGS_((Tk_Window tkwin, + CONST char *name)); /* 161 */ EXTERN void Tk_SetBackgroundFromBorder _ANSI_ARGS_(( Tk_Window tkwin, Tk_3DBorder border)); /* 162 */ -EXTERN void Tk_SetClass _ANSI_ARGS_((Tk_Window tkwin, - CONST char * className)); +EXTERN void Tk_SetClass _ANSI_ARGS_((Tk_Window tkwin, + CONST char *className)); /* 163 */ -EXTERN void Tk_SetGrid _ANSI_ARGS_((Tk_Window tkwin, - int reqWidth, int reqHeight, int gridWidth, +EXTERN void Tk_SetGrid _ANSI_ARGS_((Tk_Window tkwin, + int reqWidth, int reqHeight, int gridWidth, int gridHeight)); /* 164 */ -EXTERN void Tk_SetInternalBorder _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_SetInternalBorder _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 165 */ -EXTERN void Tk_SetWindowBackground _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_SetWindowBackground _ANSI_ARGS_((Tk_Window tkwin, unsigned long pixel)); /* 166 */ EXTERN void Tk_SetWindowBackgroundPixmap _ANSI_ARGS_(( Tk_Window tkwin, Pixmap pixmap)); /* 167 */ -EXTERN void Tk_SetWindowBorder _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_SetWindowBorder _ANSI_ARGS_((Tk_Window tkwin, unsigned long pixel)); /* 168 */ -EXTERN void Tk_SetWindowBorderWidth _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_SetWindowBorderWidth _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 169 */ EXTERN void Tk_SetWindowBorderPixmap _ANSI_ARGS_(( Tk_Window tkwin, Pixmap pixmap)); /* 170 */ -EXTERN void Tk_SetWindowColormap _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_SetWindowColormap _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 171 */ -EXTERN int Tk_SetWindowVisual _ANSI_ARGS_((Tk_Window tkwin, - Visual * visual, int depth, - Colormap colormap)); +EXTERN int Tk_SetWindowVisual _ANSI_ARGS_((Tk_Window tkwin, + Visual *visual, int depth, Colormap colormap)); /* 172 */ -EXTERN void Tk_SizeOfBitmap _ANSI_ARGS_((Display * display, - Pixmap bitmap, int * widthPtr, - int * heightPtr)); +EXTERN void Tk_SizeOfBitmap _ANSI_ARGS_((Display *display, + Pixmap bitmap, int *widthPtr, int *heightPtr)); /* 173 */ -EXTERN void Tk_SizeOfImage _ANSI_ARGS_((Tk_Image image, - int * widthPtr, int * heightPtr)); +EXTERN void Tk_SizeOfImage _ANSI_ARGS_((Tk_Image image, + int *widthPtr, int *heightPtr)); /* 174 */ EXTERN int Tk_StrictMotif _ANSI_ARGS_((Tk_Window tkwin)); /* 175 */ EXTERN void Tk_TextLayoutToPostscript _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_TextLayout layout)); + Tcl_Interp *interp, Tk_TextLayout layout)); /* 176 */ -EXTERN int Tk_TextWidth _ANSI_ARGS_((Tk_Font font, - CONST char * str, int numBytes)); +EXTERN int Tk_TextWidth _ANSI_ARGS_((Tk_Font font, + CONST char *str, int numBytes)); /* 177 */ EXTERN void Tk_UndefineCursor _ANSI_ARGS_((Tk_Window window)); /* 178 */ -EXTERN void Tk_UnderlineChars _ANSI_ARGS_((Display * display, - Drawable drawable, GC gc, Tk_Font tkfont, - CONST char * source, int x, int y, +EXTERN void Tk_UnderlineChars _ANSI_ARGS_((Display *display, + Drawable drawable, GC gc, Tk_Font tkfont, + CONST char *source, int x, int y, int firstByte, int lastByte)); /* 179 */ -EXTERN void Tk_UnderlineTextLayout _ANSI_ARGS_(( - Display * display, Drawable drawable, GC gc, - Tk_TextLayout layout, int x, int y, +EXTERN void Tk_UnderlineTextLayout _ANSI_ARGS_((Display *display, + Drawable drawable, GC gc, + Tk_TextLayout layout, int x, int y, int underline)); /* 180 */ EXTERN void Tk_Ungrab _ANSI_ARGS_((Tk_Window tkwin)); /* 181 */ -EXTERN void Tk_UnmaintainGeometry _ANSI_ARGS_((Tk_Window slave, +EXTERN void Tk_UnmaintainGeometry _ANSI_ARGS_((Tk_Window slave, Tk_Window master)); /* 182 */ EXTERN void Tk_UnmapWindow _ANSI_ARGS_((Tk_Window tkwin)); /* 183 */ EXTERN void Tk_UnsetGrid _ANSI_ARGS_((Tk_Window tkwin)); /* 184 */ -EXTERN void Tk_UpdatePointer _ANSI_ARGS_((Tk_Window tkwin, int x, +EXTERN void Tk_UpdatePointer _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int state)); /* 185 */ EXTERN Pixmap Tk_AllocBitmapFromObj _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window tkwin, - Tcl_Obj * objPtr)); + Tcl_Interp *interp, Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 186 */ EXTERN Tk_3DBorder Tk_Alloc3DBorderFromObj _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window tkwin, - Tcl_Obj * objPtr)); + Tcl_Interp *interp, Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 187 */ -EXTERN XColor * Tk_AllocColorFromObj _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN XColor * Tk_AllocColorFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tcl_Obj *objPtr)); /* 188 */ EXTERN Tk_Cursor Tk_AllocCursorFromObj _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window tkwin, - Tcl_Obj * objPtr)); + Tcl_Interp *interp, Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 189 */ -EXTERN Tk_Font Tk_AllocFontFromObj _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Tcl_Obj * objPtr)); +EXTERN Tk_Font Tk_AllocFontFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tcl_Obj *objPtr)); /* 190 */ -EXTERN Tk_OptionTable Tk_CreateOptionTable _ANSI_ARGS_(( - Tcl_Interp * interp, - CONST Tk_OptionSpec * templatePtr)); +EXTERN Tk_OptionTable Tk_CreateOptionTable _ANSI_ARGS_((Tcl_Interp *interp, + CONST Tk_OptionSpec *templatePtr)); /* 191 */ EXTERN void Tk_DeleteOptionTable _ANSI_ARGS_(( Tk_OptionTable optionTable)); /* 192 */ -EXTERN void Tk_Free3DBorderFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN void Tk_Free3DBorderFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 193 */ -EXTERN void Tk_FreeBitmapFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN void Tk_FreeBitmapFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 194 */ -EXTERN void Tk_FreeColorFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN void Tk_FreeColorFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 195 */ -EXTERN void Tk_FreeConfigOptions _ANSI_ARGS_((char * recordPtr, +EXTERN void Tk_FreeConfigOptions _ANSI_ARGS_((char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin)); /* 196 */ EXTERN void Tk_FreeSavedOptions _ANSI_ARGS_(( - Tk_SavedOptions * savePtr)); + Tk_SavedOptions *savePtr)); /* 197 */ -EXTERN void Tk_FreeCursorFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN void Tk_FreeCursorFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 198 */ -EXTERN void Tk_FreeFontFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN void Tk_FreeFontFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 199 */ -EXTERN Tk_3DBorder Tk_Get3DBorderFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN Tk_3DBorder Tk_Get3DBorderFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 200 */ -EXTERN int Tk_GetAnchorFromObj _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Obj * objPtr, Tk_Anchor * anchorPtr)); +EXTERN int Tk_GetAnchorFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *objPtr, Tk_Anchor *anchorPtr)); /* 201 */ -EXTERN Pixmap Tk_GetBitmapFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN Pixmap Tk_GetBitmapFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 202 */ -EXTERN XColor * Tk_GetColorFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN XColor * Tk_GetColorFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 203 */ -EXTERN Tk_Cursor Tk_GetCursorFromObj _ANSI_ARGS_((Tk_Window tkwin, - Tcl_Obj * objPtr)); +EXTERN Tk_Cursor Tk_GetCursorFromObj _ANSI_ARGS_((Tk_Window tkwin, + Tcl_Obj *objPtr)); /* 204 */ -EXTERN Tcl_Obj * Tk_GetOptionInfo _ANSI_ARGS_((Tcl_Interp * interp, - char * recordPtr, Tk_OptionTable optionTable, - Tcl_Obj * namePtr, Tk_Window tkwin)); +EXTERN Tcl_Obj * Tk_GetOptionInfo _ANSI_ARGS_((Tcl_Interp *interp, + char *recordPtr, Tk_OptionTable optionTable, + Tcl_Obj *namePtr, Tk_Window tkwin)); /* 205 */ -EXTERN Tcl_Obj * Tk_GetOptionValue _ANSI_ARGS_((Tcl_Interp * interp, - char * recordPtr, Tk_OptionTable optionTable, - Tcl_Obj * namePtr, Tk_Window tkwin)); +EXTERN Tcl_Obj * Tk_GetOptionValue _ANSI_ARGS_((Tcl_Interp *interp, + char *recordPtr, Tk_OptionTable optionTable, + Tcl_Obj *namePtr, Tk_Window tkwin)); /* 206 */ -EXTERN int Tk_GetJustifyFromObj _ANSI_ARGS_(( - Tcl_Interp * interp, Tcl_Obj * objPtr, - Tk_Justify * justifyPtr)); +EXTERN int Tk_GetJustifyFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *objPtr, Tk_Justify *justifyPtr)); /* 207 */ -EXTERN int Tk_GetMMFromObj _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Tcl_Obj * objPtr, - double * doublePtr)); +EXTERN int Tk_GetMMFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tcl_Obj *objPtr, + double *doublePtr)); /* 208 */ -EXTERN int Tk_GetPixelsFromObj _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Tcl_Obj * objPtr, - int * intPtr)); +EXTERN int Tk_GetPixelsFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tcl_Obj *objPtr, + int *intPtr)); /* 209 */ -EXTERN int Tk_GetReliefFromObj _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Obj * objPtr, int * resultPtr)); +EXTERN int Tk_GetReliefFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *objPtr, int *resultPtr)); /* 210 */ -EXTERN int Tk_GetScrollInfoObj _ANSI_ARGS_((Tcl_Interp * interp, - int objc, Tcl_Obj *CONST objv[], - double * dblPtr, int * intPtr)); +EXTERN int Tk_GetScrollInfoObj _ANSI_ARGS_((Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[], + double *dblPtr, int *intPtr)); /* 211 */ -EXTERN int Tk_InitOptions _ANSI_ARGS_((Tcl_Interp * interp, - char * recordPtr, Tk_OptionTable optionToken, +EXTERN int Tk_InitOptions _ANSI_ARGS_((Tcl_Interp *interp, + char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin)); /* 212 */ -EXTERN void Tk_MainEx _ANSI_ARGS_((int argc, char ** argv, - Tcl_AppInitProc * appInitProc, - Tcl_Interp * interp)); +EXTERN void Tk_MainEx _ANSI_ARGS_((int argc, char **argv, + Tcl_AppInitProc *appInitProc, + Tcl_Interp *interp)); /* 213 */ EXTERN void Tk_RestoreSavedOptions _ANSI_ARGS_(( - Tk_SavedOptions * savePtr)); + Tk_SavedOptions *savePtr)); /* 214 */ -EXTERN int Tk_SetOptions _ANSI_ARGS_((Tcl_Interp * interp, - char * recordPtr, Tk_OptionTable optionTable, - int objc, Tcl_Obj *CONST objv[], - Tk_Window tkwin, Tk_SavedOptions * savePtr, - int * maskPtr)); +EXTERN int Tk_SetOptions _ANSI_ARGS_((Tcl_Interp *interp, + char *recordPtr, Tk_OptionTable optionTable, + int objc, Tcl_Obj *CONST objv[], + Tk_Window tkwin, Tk_SavedOptions *savePtr, + int *maskPtr)); /* 215 */ EXTERN void Tk_InitConsoleChannels _ANSI_ARGS_(( - Tcl_Interp * interp)); + Tcl_Interp *interp)); /* 216 */ EXTERN int Tk_CreateConsoleWindow _ANSI_ARGS_(( - Tcl_Interp * interp)); + Tcl_Interp *interp)); /* 217 */ EXTERN void Tk_CreateSmoothMethod _ANSI_ARGS_(( - Tcl_Interp * interp, - Tk_SmoothMethod * method)); + Tcl_Interp *interp, Tk_SmoothMethod *method)); /* Slot 218 is reserved */ /* Slot 219 is reserved */ /* 220 */ -EXTERN int Tk_GetDash _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * value, Tk_Dash * dash)); +EXTERN int Tk_GetDash _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *value, Tk_Dash *dash)); /* 221 */ -EXTERN void Tk_CreateOutline _ANSI_ARGS_((Tk_Outline * outline)); +EXTERN void Tk_CreateOutline _ANSI_ARGS_((Tk_Outline *outline)); /* 222 */ -EXTERN void Tk_DeleteOutline _ANSI_ARGS_((Display * display, - Tk_Outline * outline)); +EXTERN void Tk_DeleteOutline _ANSI_ARGS_((Display *display, + Tk_Outline *outline)); /* 223 */ -EXTERN int Tk_ConfigOutlineGC _ANSI_ARGS_((XGCValues * gcValues, - Tk_Canvas canvas, Tk_Item * item, - Tk_Outline * outline)); +EXTERN int Tk_ConfigOutlineGC _ANSI_ARGS_((XGCValues *gcValues, + Tk_Canvas canvas, Tk_Item *item, + Tk_Outline *outline)); /* 224 */ -EXTERN int Tk_ChangeOutlineGC _ANSI_ARGS_((Tk_Canvas canvas, - Tk_Item * item, Tk_Outline * outline)); +EXTERN int Tk_ChangeOutlineGC _ANSI_ARGS_((Tk_Canvas canvas, + Tk_Item *item, Tk_Outline *outline)); /* 225 */ -EXTERN int Tk_ResetOutlineGC _ANSI_ARGS_((Tk_Canvas canvas, - Tk_Item * item, Tk_Outline * outline)); +EXTERN int Tk_ResetOutlineGC _ANSI_ARGS_((Tk_Canvas canvas, + Tk_Item *item, Tk_Outline *outline)); /* 226 */ -EXTERN int Tk_CanvasPsOutline _ANSI_ARGS_((Tk_Canvas canvas, - Tk_Item * item, Tk_Outline * outline)); +EXTERN int Tk_CanvasPsOutline _ANSI_ARGS_((Tk_Canvas canvas, + Tk_Item *item, Tk_Outline *outline)); /* 227 */ -EXTERN void Tk_SetTSOrigin _ANSI_ARGS_((Tk_Window tkwin, GC gc, +EXTERN void Tk_SetTSOrigin _ANSI_ARGS_((Tk_Window tkwin, GC gc, int x, int y)); /* 228 */ EXTERN int Tk_CanvasGetCoordFromObj _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Canvas canvas, - Tcl_Obj * obj, double * doublePtr)); + Tcl_Interp *interp, Tk_Canvas canvas, + Tcl_Obj *obj, double *doublePtr)); /* 229 */ -EXTERN void Tk_CanvasSetOffset _ANSI_ARGS_((Tk_Canvas canvas, - GC gc, Tk_TSOffset * offset)); +EXTERN void Tk_CanvasSetOffset _ANSI_ARGS_((Tk_Canvas canvas, + GC gc, Tk_TSOffset *offset)); /* 230 */ -EXTERN void Tk_DitherPhoto _ANSI_ARGS_((Tk_PhotoHandle handle, +EXTERN void Tk_DitherPhoto _ANSI_ARGS_((Tk_PhotoHandle handle, int x, int y, int width, int height)); /* 231 */ -EXTERN int Tk_PostscriptBitmap _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Tk_PostscriptInfo psInfo, - Pixmap bitmap, int startX, int startY, +EXTERN int Tk_PostscriptBitmap _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tk_PostscriptInfo psInfo, + Pixmap bitmap, int startX, int startY, int width, int height)); /* 232 */ -EXTERN int Tk_PostscriptColor _ANSI_ARGS_((Tcl_Interp * interp, - Tk_PostscriptInfo psInfo, XColor * colorPtr)); +EXTERN int Tk_PostscriptColor _ANSI_ARGS_((Tcl_Interp *interp, + Tk_PostscriptInfo psInfo, XColor *colorPtr)); /* 233 */ -EXTERN int Tk_PostscriptFont _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int Tk_PostscriptFont _ANSI_ARGS_((Tcl_Interp *interp, Tk_PostscriptInfo psInfo, Tk_Font font)); /* 234 */ -EXTERN int Tk_PostscriptImage _ANSI_ARGS_((Tk_Image image, - Tcl_Interp * interp, Tk_Window tkwin, - Tk_PostscriptInfo psinfo, int x, int y, +EXTERN int Tk_PostscriptImage _ANSI_ARGS_((Tk_Image image, + Tcl_Interp *interp, Tk_Window tkwin, + Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass)); /* 235 */ -EXTERN void Tk_PostscriptPath _ANSI_ARGS_((Tcl_Interp * interp, - Tk_PostscriptInfo psInfo, double * coordPtr, +EXTERN void Tk_PostscriptPath _ANSI_ARGS_((Tcl_Interp *interp, + Tk_PostscriptInfo psInfo, double *coordPtr, int numPoints)); /* 236 */ -EXTERN int Tk_PostscriptStipple _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window tkwin, - Tk_PostscriptInfo psInfo, Pixmap bitmap)); +EXTERN int Tk_PostscriptStipple _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tk_PostscriptInfo psInfo, + Pixmap bitmap)); /* 237 */ -EXTERN double Tk_PostscriptY _ANSI_ARGS_((double y, +EXTERN double Tk_PostscriptY _ANSI_ARGS_((double y, Tk_PostscriptInfo psInfo)); /* 238 */ -EXTERN int Tk_PostscriptPhoto _ANSI_ARGS_((Tcl_Interp * interp, - Tk_PhotoImageBlock * blockPtr, - Tk_PostscriptInfo psInfo, int width, +EXTERN int Tk_PostscriptPhoto _ANSI_ARGS_((Tcl_Interp *interp, + Tk_PhotoImageBlock *blockPtr, + Tk_PostscriptInfo psInfo, int width, int height)); /* 239 */ EXTERN void Tk_CreateClientMessageHandler _ANSI_ARGS_(( - Tk_ClientMessageProc * proc)); + Tk_ClientMessageProc *proc)); /* 240 */ EXTERN void Tk_DeleteClientMessageHandler _ANSI_ARGS_(( - Tk_ClientMessageProc * proc)); + Tk_ClientMessageProc *proc)); /* 241 */ EXTERN Tk_Window Tk_CreateAnonymousWindow _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Window parent, - CONST char * screenName)); + Tcl_Interp *interp, Tk_Window parent, + CONST char *screenName)); /* 242 */ -EXTERN void Tk_SetClassProcs _ANSI_ARGS_((Tk_Window tkwin, - Tk_ClassProcs * procs, +EXTERN void Tk_SetClassProcs _ANSI_ARGS_((Tk_Window tkwin, + Tk_ClassProcs *procs, ClientData instanceData)); /* 243 */ -EXTERN void Tk_SetInternalBorderEx _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void Tk_SetInternalBorderEx _ANSI_ARGS_((Tk_Window tkwin, int left, int right, int top, int bottom)); /* 244 */ EXTERN void Tk_SetMinimumRequestSize _ANSI_ARGS_(( Tk_Window tkwin, int minWidth, int minHeight)); /* 245 */ -EXTERN void Tk_SetCaretPos _ANSI_ARGS_((Tk_Window tkwin, int x, +EXTERN void Tk_SetCaretPos _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int height)); /* 246 */ -EXTERN void Tk_PhotoPutBlock _ANSI_ARGS_((Tk_PhotoHandle handle, - Tk_PhotoImageBlock * blockPtr, int x, int y, +EXTERN void Tk_PhotoPutBlock _ANSI_ARGS_((Tk_PhotoHandle handle, + Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule)); /* 247 */ EXTERN void Tk_PhotoPutZoomedBlock _ANSI_ARGS_(( - Tk_PhotoHandle handle, - Tk_PhotoImageBlock * blockPtr, int x, int y, - int width, int height, int zoomX, int zoomY, + Tk_PhotoHandle handle, + Tk_PhotoImageBlock *blockPtr, int x, int y, + int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule)); /* 248 */ EXTERN int Tk_CollapseMotionEvents _ANSI_ARGS_(( - Display * display, int collapse)); + Display *display, int collapse)); /* 249 */ -EXTERN Tk_StyleEngine Tk_RegisterStyleEngine _ANSI_ARGS_(( - CONST char * name, Tk_StyleEngine parent)); +EXTERN Tk_StyleEngine Tk_RegisterStyleEngine _ANSI_ARGS_((CONST char *name, + Tk_StyleEngine parent)); /* 250 */ -EXTERN Tk_StyleEngine Tk_GetStyleEngine _ANSI_ARGS_((CONST char * name)); +EXTERN Tk_StyleEngine Tk_GetStyleEngine _ANSI_ARGS_((CONST char *name)); /* 251 */ EXTERN int Tk_RegisterStyledElement _ANSI_ARGS_(( - Tk_StyleEngine engine, - Tk_ElementSpec * templatePtr)); + Tk_StyleEngine engine, + Tk_ElementSpec *templatePtr)); /* 252 */ -EXTERN int Tk_GetElementId _ANSI_ARGS_((CONST char * name)); +EXTERN int Tk_GetElementId _ANSI_ARGS_((CONST char *name)); /* 253 */ -EXTERN Tk_Style Tk_CreateStyle _ANSI_ARGS_((CONST char * name, +EXTERN Tk_Style Tk_CreateStyle _ANSI_ARGS_((CONST char *name, Tk_StyleEngine engine, ClientData clientData)); /* 254 */ -EXTERN Tk_Style Tk_GetStyle _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * name)); +EXTERN Tk_Style Tk_GetStyle _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *name)); /* 255 */ EXTERN void Tk_FreeStyle _ANSI_ARGS_((Tk_Style style)); /* 256 */ EXTERN CONST char * Tk_NameOfStyle _ANSI_ARGS_((Tk_Style style)); /* 257 */ -EXTERN Tk_Style Tk_AllocStyleFromObj _ANSI_ARGS_(( - Tcl_Interp * interp, Tcl_Obj * objPtr)); +EXTERN Tk_Style Tk_AllocStyleFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *objPtr)); /* 258 */ -EXTERN Tk_Style Tk_GetStyleFromObj _ANSI_ARGS_((Tcl_Obj * objPtr)); +EXTERN Tk_Style Tk_GetStyleFromObj _ANSI_ARGS_((Tcl_Obj *objPtr)); /* 259 */ -EXTERN void Tk_FreeStyleFromObj _ANSI_ARGS_((Tcl_Obj * objPtr)); +EXTERN void Tk_FreeStyleFromObj _ANSI_ARGS_((Tcl_Obj *objPtr)); /* 260 */ -EXTERN Tk_StyledElement Tk_GetStyledElement _ANSI_ARGS_((Tk_Style style, +EXTERN Tk_StyledElement Tk_GetStyledElement _ANSI_ARGS_((Tk_Style style, int elementId, Tk_OptionTable optionTable)); /* 261 */ -EXTERN void Tk_GetElementSize _ANSI_ARGS_((Tk_Style style, - Tk_StyledElement element, char * recordPtr, - Tk_Window tkwin, int width, int height, - int inner, int * widthPtr, int * heightPtr)); +EXTERN void Tk_GetElementSize _ANSI_ARGS_((Tk_Style style, + Tk_StyledElement element, char *recordPtr, + Tk_Window tkwin, int width, int height, + int inner, int *widthPtr, int *heightPtr)); /* 262 */ -EXTERN void Tk_GetElementBox _ANSI_ARGS_((Tk_Style style, - Tk_StyledElement element, char * recordPtr, - Tk_Window tkwin, int x, int y, int width, - int height, int inner, int * xPtr, - int * yPtr, int * widthPtr, int * heightPtr)); +EXTERN void Tk_GetElementBox _ANSI_ARGS_((Tk_Style style, + Tk_StyledElement element, char *recordPtr, + Tk_Window tkwin, int x, int y, int width, + int height, int inner, int *xPtr, int *yPtr, + int *widthPtr, int *heightPtr)); /* 263 */ -EXTERN int Tk_GetElementBorderWidth _ANSI_ARGS_((Tk_Style style, - Tk_StyledElement element, char * recordPtr, +EXTERN int Tk_GetElementBorderWidth _ANSI_ARGS_((Tk_Style style, + Tk_StyledElement element, char *recordPtr, Tk_Window tkwin)); /* 264 */ -EXTERN void Tk_DrawElement _ANSI_ARGS_((Tk_Style style, - Tk_StyledElement element, char * recordPtr, - Tk_Window tkwin, Drawable d, int x, int y, +EXTERN void Tk_DrawElement _ANSI_ARGS_((Tk_Style style, + Tk_StyledElement element, char *recordPtr, + Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state)); typedef struct TkStubHooks { @@ -931,164 +922,164 @@ typedef struct TkStubs { GC (*tk_3DBorderGC) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 2 */ void (*tk_3DHorizontalBevel) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief)); /* 3 */ void (*tk_3DVerticalBevel) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief)); /* 4 */ - void (*tk_AddOption) _ANSI_ARGS_((Tk_Window tkwin, CONST char * name, CONST char * value, int priority)); /* 5 */ - void (*tk_BindEvent) _ANSI_ARGS_((Tk_BindingTable bindingTable, XEvent * eventPtr, Tk_Window tkwin, int numObjects, ClientData * objectPtr)); /* 6 */ - void (*tk_CanvasDrawableCoords) _ANSI_ARGS_((Tk_Canvas canvas, double x, double y, short * drawableXPtr, short * drawableYPtr)); /* 7 */ + void (*tk_AddOption) _ANSI_ARGS_((Tk_Window tkwin, CONST char *name, CONST char *value, int priority)); /* 5 */ + void (*tk_BindEvent) _ANSI_ARGS_((Tk_BindingTable bindingTable, XEvent *eventPtr, Tk_Window tkwin, int numObjects, ClientData *objectPtr)); /* 6 */ + void (*tk_CanvasDrawableCoords) _ANSI_ARGS_((Tk_Canvas canvas, double x, double y, short *drawableXPtr, short *drawableYPtr)); /* 7 */ void (*tk_CanvasEventuallyRedraw) _ANSI_ARGS_((Tk_Canvas canvas, int x1, int y1, int x2, int y2)); /* 8 */ - int (*tk_CanvasGetCoord) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, CONST char * str, double * doublePtr)); /* 9 */ + int (*tk_CanvasGetCoord) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, CONST char *str, double *doublePtr)); /* 9 */ Tk_CanvasTextInfo * (*tk_CanvasGetTextInfo) _ANSI_ARGS_((Tk_Canvas canvas)); /* 10 */ - int (*tk_CanvasPsBitmap) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height)); /* 11 */ - int (*tk_CanvasPsColor) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, XColor * colorPtr)); /* 12 */ - int (*tk_CanvasPsFont) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, Tk_Font font)); /* 13 */ - void (*tk_CanvasPsPath) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, double * coordPtr, int numPoints)); /* 14 */ - int (*tk_CanvasPsStipple) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, Pixmap bitmap)); /* 15 */ + int (*tk_CanvasPsBitmap) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height)); /* 11 */ + int (*tk_CanvasPsColor) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, XColor *colorPtr)); /* 12 */ + int (*tk_CanvasPsFont) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, Tk_Font font)); /* 13 */ + void (*tk_CanvasPsPath) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr, int numPoints)); /* 14 */ + int (*tk_CanvasPsStipple) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap)); /* 15 */ double (*tk_CanvasPsY) _ANSI_ARGS_((Tk_Canvas canvas, double y)); /* 16 */ void (*tk_CanvasSetStippleOrigin) _ANSI_ARGS_((Tk_Canvas canvas, GC gc)); /* 17 */ - int (*tk_CanvasTagsParseProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, CONST char * value, char * widgRec, int offset)); /* 18 */ - char * (*tk_CanvasTagsPrintProc) _ANSI_ARGS_((ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr)); /* 19 */ + int (*tk_CanvasTagsParseProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset)); /* 18 */ + char * (*tk_CanvasTagsPrintProc) _ANSI_ARGS_((ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)); /* 19 */ Tk_Window (*tk_CanvasTkwin) _ANSI_ARGS_((Tk_Canvas canvas)); /* 20 */ - void (*tk_CanvasWindowCoords) _ANSI_ARGS_((Tk_Canvas canvas, double x, double y, short * screenXPtr, short * screenYPtr)); /* 21 */ - void (*tk_ChangeWindowAttributes) _ANSI_ARGS_((Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes * attsPtr)); /* 22 */ - int (*tk_CharBbox) _ANSI_ARGS_((Tk_TextLayout layout, int index, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr)); /* 23 */ + void (*tk_CanvasWindowCoords) _ANSI_ARGS_((Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr)); /* 21 */ + void (*tk_ChangeWindowAttributes) _ANSI_ARGS_((Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes *attsPtr)); /* 22 */ + int (*tk_CharBbox) _ANSI_ARGS_((Tk_TextLayout layout, int index, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr)); /* 23 */ void (*tk_ClearSelection) _ANSI_ARGS_((Tk_Window tkwin, Atom selection)); /* 24 */ - int (*tk_ClipboardAppend) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Atom target, Atom format, char* buffer)); /* 25 */ - int (*tk_ClipboardClear) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin)); /* 26 */ - int (*tk_ConfigureInfo) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags)); /* 27 */ - int (*tk_ConfigureValue) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags)); /* 28 */ - int (*tk_ConfigureWidget) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, int argc, CONST84 char ** argv, char * widgRec, int flags)); /* 29 */ - void (*tk_ConfigureWindow) _ANSI_ARGS_((Tk_Window tkwin, unsigned int valueMask, XWindowChanges * valuePtr)); /* 30 */ - Tk_TextLayout (*tk_ComputeTextLayout) _ANSI_ARGS_((Tk_Font font, CONST char * str, int numChars, int wrapLength, Tk_Justify justify, int flags, int * widthPtr, int * heightPtr)); /* 31 */ + int (*tk_ClipboardAppend) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Atom target, Atom format, char *buffer)); /* 25 */ + int (*tk_ClipboardClear) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 26 */ + int (*tk_ConfigureInfo) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags)); /* 27 */ + int (*tk_ConfigureValue) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags)); /* 28 */ + int (*tk_ConfigureWidget) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags)); /* 29 */ + void (*tk_ConfigureWindow) _ANSI_ARGS_((Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr)); /* 30 */ + Tk_TextLayout (*tk_ComputeTextLayout) _ANSI_ARGS_((Tk_Font font, CONST char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr)); /* 31 */ Tk_Window (*tk_CoordsToWindow) _ANSI_ARGS_((int rootX, int rootY, Tk_Window tkwin)); /* 32 */ - unsigned long (*tk_CreateBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr, CONST char * command, int append)); /* 33 */ - Tk_BindingTable (*tk_CreateBindingTable) _ANSI_ARGS_((Tcl_Interp * interp)); /* 34 */ - Tk_ErrorHandler (*tk_CreateErrorHandler) _ANSI_ARGS_((Display * display, int errNum, int request, int minorCode, Tk_ErrorProc * errorProc, ClientData clientData)); /* 35 */ - void (*tk_CreateEventHandler) _ANSI_ARGS_((Tk_Window token, unsigned long mask, Tk_EventProc * proc, ClientData clientData)); /* 36 */ - void (*tk_CreateGenericHandler) _ANSI_ARGS_((Tk_GenericProc * proc, ClientData clientData)); /* 37 */ - void (*tk_CreateImageType) _ANSI_ARGS_((Tk_ImageType * typePtr)); /* 38 */ - void (*tk_CreateItemType) _ANSI_ARGS_((Tk_ItemType * typePtr)); /* 39 */ - void (*tk_CreatePhotoImageFormat) _ANSI_ARGS_((Tk_PhotoImageFormat * formatPtr)); /* 40 */ - void (*tk_CreateSelHandler) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc * proc, ClientData clientData, Atom format)); /* 41 */ - Tk_Window (*tk_CreateWindow) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window parent, CONST char * name, CONST char * screenName)); /* 42 */ - Tk_Window (*tk_CreateWindowFromPath) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * pathName, CONST char * screenName)); /* 43 */ - int (*tk_DefineBitmap) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, CONST char * source, int width, int height)); /* 44 */ + unsigned long (*tk_CreateBinding) _ANSI_ARGS_((Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr, CONST char *script, int append)); /* 33 */ + Tk_BindingTable (*tk_CreateBindingTable) _ANSI_ARGS_((Tcl_Interp *interp)); /* 34 */ + Tk_ErrorHandler (*tk_CreateErrorHandler) _ANSI_ARGS_((Display *display, int errNum, int request, int minorCode, Tk_ErrorProc *errorProc, ClientData clientData)); /* 35 */ + void (*tk_CreateEventHandler) _ANSI_ARGS_((Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData)); /* 36 */ + void (*tk_CreateGenericHandler) _ANSI_ARGS_((Tk_GenericProc *proc, ClientData clientData)); /* 37 */ + void (*tk_CreateImageType) _ANSI_ARGS_((Tk_ImageType *typePtr)); /* 38 */ + void (*tk_CreateItemType) _ANSI_ARGS_((Tk_ItemType *typePtr)); /* 39 */ + void (*tk_CreatePhotoImageFormat) _ANSI_ARGS_((Tk_PhotoImageFormat *formatPtr)); /* 40 */ + void (*tk_CreateSelHandler) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc *proc, ClientData clientData, Atom format)); /* 41 */ + Tk_Window (*tk_CreateWindow) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window parent, CONST char *name, CONST char *screenName)); /* 42 */ + Tk_Window (*tk_CreateWindowFromPath) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *pathName, CONST char *screenName)); /* 43 */ + int (*tk_DefineBitmap) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, CONST char *source, int width, int height)); /* 44 */ void (*tk_DefineCursor) _ANSI_ARGS_((Tk_Window window, Tk_Cursor cursor)); /* 45 */ void (*tk_DeleteAllBindings) _ANSI_ARGS_((Tk_BindingTable bindingTable, ClientData object)); /* 46 */ - int (*tk_DeleteBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr)); /* 47 */ + int (*tk_DeleteBinding) _ANSI_ARGS_((Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr)); /* 47 */ void (*tk_DeleteBindingTable) _ANSI_ARGS_((Tk_BindingTable bindingTable)); /* 48 */ void (*tk_DeleteErrorHandler) _ANSI_ARGS_((Tk_ErrorHandler handler)); /* 49 */ - void (*tk_DeleteEventHandler) _ANSI_ARGS_((Tk_Window token, unsigned long mask, Tk_EventProc * proc, ClientData clientData)); /* 50 */ - void (*tk_DeleteGenericHandler) _ANSI_ARGS_((Tk_GenericProc * proc, ClientData clientData)); /* 51 */ - void (*tk_DeleteImage) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name)); /* 52 */ + void (*tk_DeleteEventHandler) _ANSI_ARGS_((Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData)); /* 50 */ + void (*tk_DeleteGenericHandler) _ANSI_ARGS_((Tk_GenericProc *proc, ClientData clientData)); /* 51 */ + void (*tk_DeleteImage) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name)); /* 52 */ void (*tk_DeleteSelHandler) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Atom target)); /* 53 */ void (*tk_DestroyWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 54 */ CONST84_RETURN char * (*tk_DisplayName) _ANSI_ARGS_((Tk_Window tkwin)); /* 55 */ int (*tk_DistanceToTextLayout) _ANSI_ARGS_((Tk_TextLayout layout, int x, int y)); /* 56 */ - void (*tk_Draw3DPolygon) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint * pointPtr, int numPoints, int borderWidth, int leftRelief)); /* 57 */ + void (*tk_Draw3DPolygon) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief)); /* 57 */ void (*tk_Draw3DRectangle) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief)); /* 58 */ - void (*tk_DrawChars) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int numBytes, int x, int y)); /* 59 */ + void (*tk_DrawChars) _ANSI_ARGS_((Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int numBytes, int x, int y)); /* 59 */ void (*tk_DrawFocusHighlight) _ANSI_ARGS_((Tk_Window tkwin, GC gc, int width, Drawable drawable)); /* 60 */ - void (*tk_DrawTextLayout) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar)); /* 61 */ - void (*tk_Fill3DPolygon) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint * pointPtr, int numPoints, int borderWidth, int leftRelief)); /* 62 */ + void (*tk_DrawTextLayout) _ANSI_ARGS_((Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar)); /* 61 */ + void (*tk_Fill3DPolygon) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief)); /* 62 */ void (*tk_Fill3DRectangle) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief)); /* 63 */ - Tk_PhotoHandle (*tk_FindPhoto) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * imageName)); /* 64 */ + Tk_PhotoHandle (*tk_FindPhoto) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *imageName)); /* 64 */ Font (*tk_FontId) _ANSI_ARGS_((Tk_Font font)); /* 65 */ void (*tk_Free3DBorder) _ANSI_ARGS_((Tk_3DBorder border)); /* 66 */ - void (*tk_FreeBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap)); /* 67 */ - void (*tk_FreeColor) _ANSI_ARGS_((XColor * colorPtr)); /* 68 */ - void (*tk_FreeColormap) _ANSI_ARGS_((Display * display, Colormap colormap)); /* 69 */ - void (*tk_FreeCursor) _ANSI_ARGS_((Display * display, Tk_Cursor cursor)); /* 70 */ + void (*tk_FreeBitmap) _ANSI_ARGS_((Display *display, Pixmap bitmap)); /* 67 */ + void (*tk_FreeColor) _ANSI_ARGS_((XColor *colorPtr)); /* 68 */ + void (*tk_FreeColormap) _ANSI_ARGS_((Display *display, Colormap colormap)); /* 69 */ + void (*tk_FreeCursor) _ANSI_ARGS_((Display *display, Tk_Cursor cursor)); /* 70 */ void (*tk_FreeFont) _ANSI_ARGS_((Tk_Font f)); /* 71 */ - void (*tk_FreeGC) _ANSI_ARGS_((Display * display, GC gc)); /* 72 */ + void (*tk_FreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 72 */ void (*tk_FreeImage) _ANSI_ARGS_((Tk_Image image)); /* 73 */ - void (*tk_FreeOptions) _ANSI_ARGS_((Tk_ConfigSpec * specs, char * widgRec, Display * display, int needFlags)); /* 74 */ - void (*tk_FreePixmap) _ANSI_ARGS_((Display * display, Pixmap pixmap)); /* 75 */ + void (*tk_FreeOptions) _ANSI_ARGS_((Tk_ConfigSpec *specs, char *widgRec, Display *display, int needFlags)); /* 74 */ + void (*tk_FreePixmap) _ANSI_ARGS_((Display *display, Pixmap pixmap)); /* 75 */ void (*tk_FreeTextLayout) _ANSI_ARGS_((Tk_TextLayout textLayout)); /* 76 */ - void (*tk_FreeXId) _ANSI_ARGS_((Display * display, XID xid)); /* 77 */ - GC (*tk_GCForColor) _ANSI_ARGS_((XColor * colorPtr, Drawable drawable)); /* 78 */ + void (*tk_FreeXId) _ANSI_ARGS_((Display *display, XID xid)); /* 77 */ + GC (*tk_GCForColor) _ANSI_ARGS_((XColor *colorPtr, Drawable drawable)); /* 78 */ void (*tk_GeometryRequest) _ANSI_ARGS_((Tk_Window tkwin, int reqWidth, int reqHeight)); /* 79 */ - Tk_3DBorder (*tk_Get3DBorder) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid colorName)); /* 80 */ - void (*tk_GetAllBindings) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object)); /* 81 */ - int (*tk_GetAnchor) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, Tk_Anchor * anchorPtr)); /* 82 */ + Tk_3DBorder (*tk_Get3DBorder) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName)); /* 80 */ + void (*tk_GetAllBindings) _ANSI_ARGS_((Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object)); /* 81 */ + int (*tk_GetAnchor) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, Tk_Anchor *anchorPtr)); /* 82 */ CONST84_RETURN char * (*tk_GetAtomName) _ANSI_ARGS_((Tk_Window tkwin, Atom atom)); /* 83 */ - CONST84_RETURN char * (*tk_GetBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr)); /* 84 */ - Pixmap (*tk_GetBitmap) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str)); /* 85 */ - Pixmap (*tk_GetBitmapFromData) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, int width, int height)); /* 86 */ - int (*tk_GetCapStyle) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, int * capPtr)); /* 87 */ - XColor * (*tk_GetColor) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid name)); /* 88 */ - XColor * (*tk_GetColorByValue) _ANSI_ARGS_((Tk_Window tkwin, XColor * colorPtr)); /* 89 */ - Colormap (*tk_GetColormap) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str)); /* 90 */ - Tk_Cursor (*tk_GetCursor) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid str)); /* 91 */ - Tk_Cursor (*tk_GetCursorFromData) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, CONST char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg)); /* 92 */ - Tk_Font (*tk_GetFont) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str)); /* 93 */ - Tk_Font (*tk_GetFontFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 94 */ - void (*tk_GetFontMetrics) _ANSI_ARGS_((Tk_Font font, Tk_FontMetrics * fmPtr)); /* 95 */ - GC (*tk_GetGC) _ANSI_ARGS_((Tk_Window tkwin, unsigned long valueMask, XGCValues * valuePtr)); /* 96 */ - Tk_Image (*tk_GetImage) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * name, Tk_ImageChangedProc * changeProc, ClientData clientData)); /* 97 */ - ClientData (*tk_GetImageMasterData) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tk_ImageType ** typePtrPtr)); /* 98 */ + CONST84_RETURN char * (*tk_GetBinding) _ANSI_ARGS_((Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr)); /* 84 */ + Pixmap (*tk_GetBitmap) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *str)); /* 85 */ + Pixmap (*tk_GetBitmapFromData) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, int width, int height)); /* 86 */ + int (*tk_GetCapStyle) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, int *capPtr)); /* 87 */ + XColor * (*tk_GetColor) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name)); /* 88 */ + XColor * (*tk_GetColorByValue) _ANSI_ARGS_((Tk_Window tkwin, XColor *colorPtr)); /* 89 */ + Colormap (*tk_GetColormap) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *str)); /* 90 */ + Tk_Cursor (*tk_GetCursor) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str)); /* 91 */ + Tk_Cursor (*tk_GetCursorFromData) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, CONST char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg)); /* 92 */ + Tk_Font (*tk_GetFont) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *str)); /* 93 */ + Tk_Font (*tk_GetFontFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 94 */ + void (*tk_GetFontMetrics) _ANSI_ARGS_((Tk_Font font, Tk_FontMetrics *fmPtr)); /* 95 */ + GC (*tk_GetGC) _ANSI_ARGS_((Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr)); /* 96 */ + Tk_Image (*tk_GetImage) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *name, Tk_ImageChangedProc *changeProc, ClientData clientData)); /* 97 */ + ClientData (*tk_GetImageMasterData) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, Tk_ImageType **typePtrPtr)); /* 98 */ Tk_ItemType * (*tk_GetItemTypes) _ANSI_ARGS_((void)); /* 99 */ - int (*tk_GetJoinStyle) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, int * joinPtr)); /* 100 */ - int (*tk_GetJustify) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, Tk_Justify * justifyPtr)); /* 101 */ + int (*tk_GetJoinStyle) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, int *joinPtr)); /* 100 */ + int (*tk_GetJustify) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *str, Tk_Justify *justifyPtr)); /* 101 */ int (*tk_GetNumMainWindows) _ANSI_ARGS_((void)); /* 102 */ - Tk_Uid (*tk_GetOption) _ANSI_ARGS_((Tk_Window tkwin, CONST char * name, CONST char * className)); /* 103 */ - int (*tk_GetPixels) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, int * intPtr)); /* 104 */ - Pixmap (*tk_GetPixmap) _ANSI_ARGS_((Display * display, Drawable d, int width, int height, int depth)); /* 105 */ - int (*tk_GetRelief) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, int * reliefPtr)); /* 106 */ - void (*tk_GetRootCoords) _ANSI_ARGS_((Tk_Window tkwin, int * xPtr, int * yPtr)); /* 107 */ - int (*tk_GetScrollInfo) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST84 char ** argv, double * dblPtr, int * intPtr)); /* 108 */ - int (*tk_GetScreenMM) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, double * doublePtr)); /* 109 */ - int (*tk_GetSelection) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc * proc, ClientData clientData)); /* 110 */ - Tk_Uid (*tk_GetUid) _ANSI_ARGS_((CONST char * str)); /* 111 */ - Visual * (*tk_GetVisual) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, int * depthPtr, Colormap * colormapPtr)); /* 112 */ - void (*tk_GetVRootGeometry) _ANSI_ARGS_((Tk_Window tkwin, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr)); /* 113 */ - int (*tk_Grab) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int grabGlobal)); /* 114 */ - void (*tk_HandleEvent) _ANSI_ARGS_((XEvent * eventPtr)); /* 115 */ - Tk_Window (*tk_IdToWindow) _ANSI_ARGS_((Display * display, Window window)); /* 116 */ + Tk_Uid (*tk_GetOption) _ANSI_ARGS_((Tk_Window tkwin, CONST char *name, CONST char *className)); /* 103 */ + int (*tk_GetPixels) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *intPtr)); /* 104 */ + Pixmap (*tk_GetPixmap) _ANSI_ARGS_((Display *display, Drawable d, int width, int height, int depth)); /* 105 */ + int (*tk_GetRelief) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name, int *reliefPtr)); /* 106 */ + void (*tk_GetRootCoords) _ANSI_ARGS_((Tk_Window tkwin, int *xPtr, int *yPtr)); /* 107 */ + int (*tk_GetScrollInfo) _ANSI_ARGS_((Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr)); /* 108 */ + int (*tk_GetScreenMM) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, double *doublePtr)); /* 109 */ + int (*tk_GetSelection) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData)); /* 110 */ + Tk_Uid (*tk_GetUid) _ANSI_ARGS_((CONST char *str)); /* 111 */ + Visual * (*tk_GetVisual) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *depthPtr, Colormap *colormapPtr)); /* 112 */ + void (*tk_GetVRootGeometry) _ANSI_ARGS_((Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr)); /* 113 */ + int (*tk_Grab) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal)); /* 114 */ + void (*tk_HandleEvent) _ANSI_ARGS_((XEvent *eventPtr)); /* 115 */ + Tk_Window (*tk_IdToWindow) _ANSI_ARGS_((Display *display, Window window)); /* 116 */ void (*tk_ImageChanged) _ANSI_ARGS_((Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight)); /* 117 */ - int (*tk_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 118 */ - Atom (*tk_InternAtom) _ANSI_ARGS_((Tk_Window tkwin, CONST char * name)); /* 119 */ + int (*tk_Init) _ANSI_ARGS_((Tcl_Interp *interp)); /* 118 */ + Atom (*tk_InternAtom) _ANSI_ARGS_((Tk_Window tkwin, CONST char *name)); /* 119 */ int (*tk_IntersectTextLayout) _ANSI_ARGS_((Tk_TextLayout layout, int x, int y, int width, int height)); /* 120 */ void (*tk_MaintainGeometry) _ANSI_ARGS_((Tk_Window slave, Tk_Window master, int x, int y, int width, int height)); /* 121 */ - Tk_Window (*tk_MainWindow) _ANSI_ARGS_((Tcl_Interp * interp)); /* 122 */ + Tk_Window (*tk_MainWindow) _ANSI_ARGS_((Tcl_Interp *interp)); /* 122 */ void (*tk_MakeWindowExist) _ANSI_ARGS_((Tk_Window tkwin)); /* 123 */ - void (*tk_ManageGeometry) _ANSI_ARGS_((Tk_Window tkwin, Tk_GeomMgr * mgrPtr, ClientData clientData)); /* 124 */ + void (*tk_ManageGeometry) _ANSI_ARGS_((Tk_Window tkwin, Tk_GeomMgr *mgrPtr, ClientData clientData)); /* 124 */ void (*tk_MapWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 125 */ - int (*tk_MeasureChars) _ANSI_ARGS_((Tk_Font tkfont, CONST char * source, int numBytes, int maxPixels, int flags, int * lengthPtr)); /* 126 */ + int (*tk_MeasureChars) _ANSI_ARGS_((Tk_Font tkfont, CONST char *source, int numBytes, int maxPixels, int flags, int *lengthPtr)); /* 126 */ void (*tk_MoveResizeWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height)); /* 127 */ void (*tk_MoveWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 128 */ void (*tk_MoveToplevelWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 129 */ CONST84_RETURN char * (*tk_NameOf3DBorder) _ANSI_ARGS_((Tk_3DBorder border)); /* 130 */ CONST84_RETURN char * (*tk_NameOfAnchor) _ANSI_ARGS_((Tk_Anchor anchor)); /* 131 */ - CONST84_RETURN char * (*tk_NameOfBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap)); /* 132 */ + CONST84_RETURN char * (*tk_NameOfBitmap) _ANSI_ARGS_((Display *display, Pixmap bitmap)); /* 132 */ CONST84_RETURN char * (*tk_NameOfCapStyle) _ANSI_ARGS_((int cap)); /* 133 */ - CONST84_RETURN char * (*tk_NameOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 134 */ - CONST84_RETURN char * (*tk_NameOfCursor) _ANSI_ARGS_((Display * display, Tk_Cursor cursor)); /* 135 */ + CONST84_RETURN char * (*tk_NameOfColor) _ANSI_ARGS_((XColor *colorPtr)); /* 134 */ + CONST84_RETURN char * (*tk_NameOfCursor) _ANSI_ARGS_((Display *display, Tk_Cursor cursor)); /* 135 */ CONST84_RETURN char * (*tk_NameOfFont) _ANSI_ARGS_((Tk_Font font)); /* 136 */ CONST84_RETURN char * (*tk_NameOfImage) _ANSI_ARGS_((Tk_ImageMaster imageMaster)); /* 137 */ CONST84_RETURN char * (*tk_NameOfJoinStyle) _ANSI_ARGS_((int join)); /* 138 */ CONST84_RETURN char * (*tk_NameOfJustify) _ANSI_ARGS_((Tk_Justify justify)); /* 139 */ CONST84_RETURN char * (*tk_NameOfRelief) _ANSI_ARGS_((int relief)); /* 140 */ - Tk_Window (*tk_NameToWindow) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * pathName, Tk_Window tkwin)); /* 141 */ - void (*tk_OwnSelection) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Tk_LostSelProc * proc, ClientData clientData)); /* 142 */ - int (*tk_ParseArgv) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, CONST84 char ** argv, Tk_ArgvInfo * argTable, int flags)); /* 143 */ - void (*tk_PhotoPutBlock_NoComposite) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height)); /* 144 */ - void (*tk_PhotoPutZoomedBlock_NoComposite) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY)); /* 145 */ - int (*tk_PhotoGetImage) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr)); /* 146 */ + Tk_Window (*tk_NameToWindow) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *pathName, Tk_Window tkwin)); /* 141 */ + void (*tk_OwnSelection) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Tk_LostSelProc *proc, ClientData clientData)); /* 142 */ + int (*tk_ParseArgv) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, Tk_ArgvInfo *argTable, int flags)); /* 143 */ + void (*tk_PhotoPutBlock_NoComposite) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height)); /* 144 */ + void (*tk_PhotoPutZoomedBlock_NoComposite) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY)); /* 145 */ + int (*tk_PhotoGetImage) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr)); /* 146 */ void (*tk_PhotoBlank) _ANSI_ARGS_((Tk_PhotoHandle handle)); /* 147 */ void (*tk_PhotoExpand) _ANSI_ARGS_((Tk_PhotoHandle handle, int width, int height)); /* 148 */ - void (*tk_PhotoGetSize) _ANSI_ARGS_((Tk_PhotoHandle handle, int * widthPtr, int * heightPtr)); /* 149 */ + void (*tk_PhotoGetSize) _ANSI_ARGS_((Tk_PhotoHandle handle, int *widthPtr, int *heightPtr)); /* 149 */ void (*tk_PhotoSetSize) _ANSI_ARGS_((Tk_PhotoHandle handle, int width, int height)); /* 150 */ int (*tk_PointToChar) _ANSI_ARGS_((Tk_TextLayout layout, int x, int y)); /* 151 */ - int (*tk_PostscriptFontName) _ANSI_ARGS_((Tk_Font tkfont, Tcl_DString * dsPtr)); /* 152 */ - void (*tk_PreserveColormap) _ANSI_ARGS_((Display * display, Colormap colormap)); /* 153 */ - void (*tk_QueueWindowEvent) _ANSI_ARGS_((XEvent * eventPtr, Tcl_QueuePosition position)); /* 154 */ + int (*tk_PostscriptFontName) _ANSI_ARGS_((Tk_Font tkfont, Tcl_DString *dsPtr)); /* 152 */ + void (*tk_PreserveColormap) _ANSI_ARGS_((Display *display, Colormap colormap)); /* 153 */ + void (*tk_QueueWindowEvent) _ANSI_ARGS_((XEvent *eventPtr, Tcl_QueuePosition position)); /* 154 */ void (*tk_RedrawImage) _ANSI_ARGS_((Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY)); /* 155 */ void (*tk_ResizeWindow) _ANSI_ARGS_((Tk_Window tkwin, int width, int height)); /* 156 */ int (*tk_RestackWindow) _ANSI_ARGS_((Tk_Window tkwin, int aboveBelow, Tk_Window other)); /* 157 */ - Tk_RestrictProc * (*tk_RestrictEvents) _ANSI_ARGS_((Tk_RestrictProc * proc, ClientData arg, ClientData * prevArgPtr)); /* 158 */ - int (*tk_SafeInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 159 */ - CONST char * (*tk_SetAppName) _ANSI_ARGS_((Tk_Window tkwin, CONST char * name)); /* 160 */ + Tk_RestrictProc * (*tk_RestrictEvents) _ANSI_ARGS_((Tk_RestrictProc *proc, ClientData arg, ClientData *prevArgPtr)); /* 158 */ + int (*tk_SafeInit) _ANSI_ARGS_((Tcl_Interp *interp)); /* 159 */ + CONST char * (*tk_SetAppName) _ANSI_ARGS_((Tk_Window tkwin, CONST char *name)); /* 160 */ void (*tk_SetBackgroundFromBorder) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border)); /* 161 */ - void (*tk_SetClass) _ANSI_ARGS_((Tk_Window tkwin, CONST char * className)); /* 162 */ + void (*tk_SetClass) _ANSI_ARGS_((Tk_Window tkwin, CONST char *className)); /* 162 */ void (*tk_SetGrid) _ANSI_ARGS_((Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight)); /* 163 */ void (*tk_SetInternalBorder) _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 164 */ void (*tk_SetWindowBackground) _ANSI_ARGS_((Tk_Window tkwin, unsigned long pixel)); /* 165 */ @@ -1097,100 +1088,100 @@ typedef struct TkStubs { void (*tk_SetWindowBorderWidth) _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 168 */ void (*tk_SetWindowBorderPixmap) _ANSI_ARGS_((Tk_Window tkwin, Pixmap pixmap)); /* 169 */ void (*tk_SetWindowColormap) _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 170 */ - int (*tk_SetWindowVisual) _ANSI_ARGS_((Tk_Window tkwin, Visual * visual, int depth, Colormap colormap)); /* 171 */ - void (*tk_SizeOfBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap, int * widthPtr, int * heightPtr)); /* 172 */ - void (*tk_SizeOfImage) _ANSI_ARGS_((Tk_Image image, int * widthPtr, int * heightPtr)); /* 173 */ + int (*tk_SetWindowVisual) _ANSI_ARGS_((Tk_Window tkwin, Visual *visual, int depth, Colormap colormap)); /* 171 */ + void (*tk_SizeOfBitmap) _ANSI_ARGS_((Display *display, Pixmap bitmap, int *widthPtr, int *heightPtr)); /* 172 */ + void (*tk_SizeOfImage) _ANSI_ARGS_((Tk_Image image, int *widthPtr, int *heightPtr)); /* 173 */ int (*tk_StrictMotif) _ANSI_ARGS_((Tk_Window tkwin)); /* 174 */ - void (*tk_TextLayoutToPostscript) _ANSI_ARGS_((Tcl_Interp * interp, Tk_TextLayout layout)); /* 175 */ - int (*tk_TextWidth) _ANSI_ARGS_((Tk_Font font, CONST char * str, int numBytes)); /* 176 */ + void (*tk_TextLayoutToPostscript) _ANSI_ARGS_((Tcl_Interp *interp, Tk_TextLayout layout)); /* 175 */ + int (*tk_TextWidth) _ANSI_ARGS_((Tk_Font font, CONST char *str, int numBytes)); /* 176 */ void (*tk_UndefineCursor) _ANSI_ARGS_((Tk_Window window)); /* 177 */ - void (*tk_UnderlineChars) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int x, int y, int firstByte, int lastByte)); /* 178 */ - void (*tk_UnderlineTextLayout) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline)); /* 179 */ + void (*tk_UnderlineChars) _ANSI_ARGS_((Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int x, int y, int firstByte, int lastByte)); /* 178 */ + void (*tk_UnderlineTextLayout) _ANSI_ARGS_((Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline)); /* 179 */ void (*tk_Ungrab) _ANSI_ARGS_((Tk_Window tkwin)); /* 180 */ void (*tk_UnmaintainGeometry) _ANSI_ARGS_((Tk_Window slave, Tk_Window master)); /* 181 */ void (*tk_UnmapWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 182 */ void (*tk_UnsetGrid) _ANSI_ARGS_((Tk_Window tkwin)); /* 183 */ void (*tk_UpdatePointer) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int state)); /* 184 */ - Pixmap (*tk_AllocBitmapFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr)); /* 185 */ - Tk_3DBorder (*tk_Alloc3DBorderFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr)); /* 186 */ - XColor * (*tk_AllocColorFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr)); /* 187 */ - Tk_Cursor (*tk_AllocCursorFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr)); /* 188 */ - Tk_Font (*tk_AllocFontFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr)); /* 189 */ - Tk_OptionTable (*tk_CreateOptionTable) _ANSI_ARGS_((Tcl_Interp * interp, CONST Tk_OptionSpec * templatePtr)); /* 190 */ + Pixmap (*tk_AllocBitmapFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr)); /* 185 */ + Tk_3DBorder (*tk_Alloc3DBorderFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr)); /* 186 */ + XColor * (*tk_AllocColorFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr)); /* 187 */ + Tk_Cursor (*tk_AllocCursorFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr)); /* 188 */ + Tk_Font (*tk_AllocFontFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr)); /* 189 */ + Tk_OptionTable (*tk_CreateOptionTable) _ANSI_ARGS_((Tcl_Interp *interp, CONST Tk_OptionSpec *templatePtr)); /* 190 */ void (*tk_DeleteOptionTable) _ANSI_ARGS_((Tk_OptionTable optionTable)); /* 191 */ - void (*tk_Free3DBorderFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 192 */ - void (*tk_FreeBitmapFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 193 */ - void (*tk_FreeColorFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 194 */ - void (*tk_FreeConfigOptions) _ANSI_ARGS_((char * recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin)); /* 195 */ - void (*tk_FreeSavedOptions) _ANSI_ARGS_((Tk_SavedOptions * savePtr)); /* 196 */ - void (*tk_FreeCursorFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 197 */ - void (*tk_FreeFontFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 198 */ - Tk_3DBorder (*tk_Get3DBorderFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 199 */ - int (*tk_GetAnchorFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, Tk_Anchor * anchorPtr)); /* 200 */ - Pixmap (*tk_GetBitmapFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 201 */ - XColor * (*tk_GetColorFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 202 */ - Tk_Cursor (*tk_GetCursorFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 203 */ - Tcl_Obj * (*tk_GetOptionInfo) _ANSI_ARGS_((Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, Tcl_Obj * namePtr, Tk_Window tkwin)); /* 204 */ - Tcl_Obj * (*tk_GetOptionValue) _ANSI_ARGS_((Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, Tcl_Obj * namePtr, Tk_Window tkwin)); /* 205 */ - int (*tk_GetJustifyFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, Tk_Justify * justifyPtr)); /* 206 */ - int (*tk_GetMMFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr, double * doublePtr)); /* 207 */ - int (*tk_GetPixelsFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr, int * intPtr)); /* 208 */ - int (*tk_GetReliefFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, int * resultPtr)); /* 209 */ - int (*tk_GetScrollInfoObj) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], double * dblPtr, int * intPtr)); /* 210 */ - int (*tk_InitOptions) _ANSI_ARGS_((Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin)); /* 211 */ - void (*tk_MainEx) _ANSI_ARGS_((int argc, char ** argv, Tcl_AppInitProc * appInitProc, Tcl_Interp * interp)); /* 212 */ - void (*tk_RestoreSavedOptions) _ANSI_ARGS_((Tk_SavedOptions * savePtr)); /* 213 */ - int (*tk_SetOptions) _ANSI_ARGS_((Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedOptions * savePtr, int * maskPtr)); /* 214 */ - void (*tk_InitConsoleChannels) _ANSI_ARGS_((Tcl_Interp * interp)); /* 215 */ - int (*tk_CreateConsoleWindow) _ANSI_ARGS_((Tcl_Interp * interp)); /* 216 */ - void (*tk_CreateSmoothMethod) _ANSI_ARGS_((Tcl_Interp * interp, Tk_SmoothMethod * method)); /* 217 */ - void *reserved218; - void *reserved219; - int (*tk_GetDash) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * value, Tk_Dash * dash)); /* 220 */ - void (*tk_CreateOutline) _ANSI_ARGS_((Tk_Outline * outline)); /* 221 */ - void (*tk_DeleteOutline) _ANSI_ARGS_((Display * display, Tk_Outline * outline)); /* 222 */ - int (*tk_ConfigOutlineGC) _ANSI_ARGS_((XGCValues * gcValues, Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline)); /* 223 */ - int (*tk_ChangeOutlineGC) _ANSI_ARGS_((Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline)); /* 224 */ - int (*tk_ResetOutlineGC) _ANSI_ARGS_((Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline)); /* 225 */ - int (*tk_CanvasPsOutline) _ANSI_ARGS_((Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline)); /* 226 */ + void (*tk_Free3DBorderFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 192 */ + void (*tk_FreeBitmapFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 193 */ + void (*tk_FreeColorFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 194 */ + void (*tk_FreeConfigOptions) _ANSI_ARGS_((char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin)); /* 195 */ + void (*tk_FreeSavedOptions) _ANSI_ARGS_((Tk_SavedOptions *savePtr)); /* 196 */ + void (*tk_FreeCursorFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 197 */ + void (*tk_FreeFontFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 198 */ + Tk_3DBorder (*tk_Get3DBorderFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 199 */ + int (*tk_GetAnchorFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Anchor *anchorPtr)); /* 200 */ + Pixmap (*tk_GetBitmapFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 201 */ + XColor * (*tk_GetColorFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 202 */ + Tk_Cursor (*tk_GetCursorFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj *objPtr)); /* 203 */ + Tcl_Obj * (*tk_GetOptionInfo) _ANSI_ARGS_((Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin)); /* 204 */ + Tcl_Obj * (*tk_GetOptionValue) _ANSI_ARGS_((Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin)); /* 205 */ + int (*tk_GetJustifyFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Justify *justifyPtr)); /* 206 */ + int (*tk_GetMMFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr)); /* 207 */ + int (*tk_GetPixelsFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr)); /* 208 */ + int (*tk_GetReliefFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr)); /* 209 */ + int (*tk_GetScrollInfoObj) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], double *dblPtr, int *intPtr)); /* 210 */ + int (*tk_InitOptions) _ANSI_ARGS_((Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin)); /* 211 */ + void (*tk_MainEx) _ANSI_ARGS_((int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp)); /* 212 */ + void (*tk_RestoreSavedOptions) _ANSI_ARGS_((Tk_SavedOptions *savePtr)); /* 213 */ + int (*tk_SetOptions) _ANSI_ARGS_((Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr)); /* 214 */ + void (*tk_InitConsoleChannels) _ANSI_ARGS_((Tcl_Interp *interp)); /* 215 */ + int (*tk_CreateConsoleWindow) _ANSI_ARGS_((Tcl_Interp *interp)); /* 216 */ + void (*tk_CreateSmoothMethod) _ANSI_ARGS_((Tcl_Interp *interp, Tk_SmoothMethod *method)); /* 217 */ + VOID *reserved218; + VOID *reserved219; + int (*tk_GetDash) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *value, Tk_Dash *dash)); /* 220 */ + void (*tk_CreateOutline) _ANSI_ARGS_((Tk_Outline *outline)); /* 221 */ + void (*tk_DeleteOutline) _ANSI_ARGS_((Display *display, Tk_Outline *outline)); /* 222 */ + int (*tk_ConfigOutlineGC) _ANSI_ARGS_((XGCValues *gcValues, Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline)); /* 223 */ + int (*tk_ChangeOutlineGC) _ANSI_ARGS_((Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline)); /* 224 */ + int (*tk_ResetOutlineGC) _ANSI_ARGS_((Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline)); /* 225 */ + int (*tk_CanvasPsOutline) _ANSI_ARGS_((Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline)); /* 226 */ void (*tk_SetTSOrigin) _ANSI_ARGS_((Tk_Window tkwin, GC gc, int x, int y)); /* 227 */ - int (*tk_CanvasGetCoordFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, Tcl_Obj * obj, double * doublePtr)); /* 228 */ - void (*tk_CanvasSetOffset) _ANSI_ARGS_((Tk_Canvas canvas, GC gc, Tk_TSOffset * offset)); /* 229 */ + int (*tk_CanvasGetCoordFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, Tcl_Obj *obj, double *doublePtr)); /* 228 */ + void (*tk_CanvasSetOffset) _ANSI_ARGS_((Tk_Canvas canvas, GC gc, Tk_TSOffset *offset)); /* 229 */ void (*tk_DitherPhoto) _ANSI_ARGS_((Tk_PhotoHandle handle, int x, int y, int width, int height)); /* 230 */ - int (*tk_PostscriptBitmap) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap, int startX, int startY, int width, int height)); /* 231 */ - int (*tk_PostscriptColor) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PostscriptInfo psInfo, XColor * colorPtr)); /* 232 */ - int (*tk_PostscriptFont) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PostscriptInfo psInfo, Tk_Font font)); /* 233 */ - int (*tk_PostscriptImage) _ANSI_ARGS_((Tk_Image image, Tcl_Interp * interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass)); /* 234 */ - void (*tk_PostscriptPath) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PostscriptInfo psInfo, double * coordPtr, int numPoints)); /* 235 */ - int (*tk_PostscriptStipple) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap)); /* 236 */ + int (*tk_PostscriptBitmap) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap, int startX, int startY, int width, int height)); /* 231 */ + int (*tk_PostscriptColor) _ANSI_ARGS_((Tcl_Interp *interp, Tk_PostscriptInfo psInfo, XColor *colorPtr)); /* 232 */ + int (*tk_PostscriptFont) _ANSI_ARGS_((Tcl_Interp *interp, Tk_PostscriptInfo psInfo, Tk_Font font)); /* 233 */ + int (*tk_PostscriptImage) _ANSI_ARGS_((Tk_Image image, Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass)); /* 234 */ + void (*tk_PostscriptPath) _ANSI_ARGS_((Tcl_Interp *interp, Tk_PostscriptInfo psInfo, double *coordPtr, int numPoints)); /* 235 */ + int (*tk_PostscriptStipple) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap)); /* 236 */ double (*tk_PostscriptY) _ANSI_ARGS_((double y, Tk_PostscriptInfo psInfo)); /* 237 */ - int (*tk_PostscriptPhoto) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PhotoImageBlock * blockPtr, Tk_PostscriptInfo psInfo, int width, int height)); /* 238 */ - void (*tk_CreateClientMessageHandler) _ANSI_ARGS_((Tk_ClientMessageProc * proc)); /* 239 */ - void (*tk_DeleteClientMessageHandler) _ANSI_ARGS_((Tk_ClientMessageProc * proc)); /* 240 */ - Tk_Window (*tk_CreateAnonymousWindow) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window parent, CONST char * screenName)); /* 241 */ - void (*tk_SetClassProcs) _ANSI_ARGS_((Tk_Window tkwin, Tk_ClassProcs * procs, ClientData instanceData)); /* 242 */ + int (*tk_PostscriptPhoto) _ANSI_ARGS_((Tcl_Interp *interp, Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, int width, int height)); /* 238 */ + void (*tk_CreateClientMessageHandler) _ANSI_ARGS_((Tk_ClientMessageProc *proc)); /* 239 */ + void (*tk_DeleteClientMessageHandler) _ANSI_ARGS_((Tk_ClientMessageProc *proc)); /* 240 */ + Tk_Window (*tk_CreateAnonymousWindow) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window parent, CONST char *screenName)); /* 241 */ + void (*tk_SetClassProcs) _ANSI_ARGS_((Tk_Window tkwin, Tk_ClassProcs *procs, ClientData instanceData)); /* 242 */ void (*tk_SetInternalBorderEx) _ANSI_ARGS_((Tk_Window tkwin, int left, int right, int top, int bottom)); /* 243 */ void (*tk_SetMinimumRequestSize) _ANSI_ARGS_((Tk_Window tkwin, int minWidth, int minHeight)); /* 244 */ void (*tk_SetCaretPos) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int height)); /* 245 */ - void (*tk_PhotoPutBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int compRule)); /* 246 */ - void (*tk_PhotoPutZoomedBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule)); /* 247 */ - int (*tk_CollapseMotionEvents) _ANSI_ARGS_((Display * display, int collapse)); /* 248 */ - Tk_StyleEngine (*tk_RegisterStyleEngine) _ANSI_ARGS_((CONST char * name, Tk_StyleEngine parent)); /* 249 */ - Tk_StyleEngine (*tk_GetStyleEngine) _ANSI_ARGS_((CONST char * name)); /* 250 */ - int (*tk_RegisterStyledElement) _ANSI_ARGS_((Tk_StyleEngine engine, Tk_ElementSpec * templatePtr)); /* 251 */ - int (*tk_GetElementId) _ANSI_ARGS_((CONST char * name)); /* 252 */ - Tk_Style (*tk_CreateStyle) _ANSI_ARGS_((CONST char * name, Tk_StyleEngine engine, ClientData clientData)); /* 253 */ - Tk_Style (*tk_GetStyle) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name)); /* 254 */ + void (*tk_PhotoPutBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule)); /* 246 */ + void (*tk_PhotoPutZoomedBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule)); /* 247 */ + int (*tk_CollapseMotionEvents) _ANSI_ARGS_((Display *display, int collapse)); /* 248 */ + Tk_StyleEngine (*tk_RegisterStyleEngine) _ANSI_ARGS_((CONST char *name, Tk_StyleEngine parent)); /* 249 */ + Tk_StyleEngine (*tk_GetStyleEngine) _ANSI_ARGS_((CONST char *name)); /* 250 */ + int (*tk_RegisterStyledElement) _ANSI_ARGS_((Tk_StyleEngine engine, Tk_ElementSpec *templatePtr)); /* 251 */ + int (*tk_GetElementId) _ANSI_ARGS_((CONST char *name)); /* 252 */ + Tk_Style (*tk_CreateStyle) _ANSI_ARGS_((CONST char *name, Tk_StyleEngine engine, ClientData clientData)); /* 253 */ + Tk_Style (*tk_GetStyle) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *name)); /* 254 */ void (*tk_FreeStyle) _ANSI_ARGS_((Tk_Style style)); /* 255 */ CONST char * (*tk_NameOfStyle) _ANSI_ARGS_((Tk_Style style)); /* 256 */ - Tk_Style (*tk_AllocStyleFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr)); /* 257 */ - Tk_Style (*tk_GetStyleFromObj) _ANSI_ARGS_((Tcl_Obj * objPtr)); /* 258 */ - void (*tk_FreeStyleFromObj) _ANSI_ARGS_((Tcl_Obj * objPtr)); /* 259 */ + Tk_Style (*tk_AllocStyleFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *objPtr)); /* 257 */ + Tk_Style (*tk_GetStyleFromObj) _ANSI_ARGS_((Tcl_Obj *objPtr)); /* 258 */ + void (*tk_FreeStyleFromObj) _ANSI_ARGS_((Tcl_Obj *objPtr)); /* 259 */ Tk_StyledElement (*tk_GetStyledElement) _ANSI_ARGS_((Tk_Style style, int elementId, Tk_OptionTable optionTable)); /* 260 */ - void (*tk_GetElementSize) _ANSI_ARGS_((Tk_Style style, Tk_StyledElement element, char * recordPtr, Tk_Window tkwin, int width, int height, int inner, int * widthPtr, int * heightPtr)); /* 261 */ - void (*tk_GetElementBox) _ANSI_ARGS_((Tk_Style style, Tk_StyledElement element, char * recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr)); /* 262 */ - int (*tk_GetElementBorderWidth) _ANSI_ARGS_((Tk_Style style, Tk_StyledElement element, char * recordPtr, Tk_Window tkwin)); /* 263 */ - void (*tk_DrawElement) _ANSI_ARGS_((Tk_Style style, Tk_StyledElement element, char * recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state)); /* 264 */ + void (*tk_GetElementSize) _ANSI_ARGS_((Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr)); /* 261 */ + void (*tk_GetElementBox) _ANSI_ARGS_((Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr)); /* 262 */ + int (*tk_GetElementBorderWidth) _ANSI_ARGS_((Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin)); /* 263 */ + void (*tk_DrawElement) _ANSI_ARGS_((Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state)); /* 264 */ } TkStubs; #ifdef __cplusplus diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 76d181c..e7f2472 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -33,318 +33,314 @@ */ /* 0 */ -EXTERN TkWindow * TkAllocWindow _ANSI_ARGS_((TkDisplay * dispPtr, - int screenNum, TkWindow * parentPtr)); +EXTERN TkWindow * TkAllocWindow _ANSI_ARGS_((TkDisplay *dispPtr, + int screenNum, TkWindow *parentPtr)); /* 1 */ -EXTERN void TkBezierPoints _ANSI_ARGS_((double control[], - int numSteps, double * coordPtr)); +EXTERN void TkBezierPoints _ANSI_ARGS_((double control[], + int numSteps, double *coordPtr)); /* 2 */ -EXTERN void TkBezierScreenPoints _ANSI_ARGS_((Tk_Canvas canvas, - double control[], int numSteps, - XPoint * xPointPtr)); +EXTERN void TkBezierScreenPoints _ANSI_ARGS_((Tk_Canvas canvas, + double control[], int numSteps, + XPoint *xPointPtr)); /* 3 */ -EXTERN void TkBindDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkBindDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 4 */ -EXTERN void TkBindEventProc _ANSI_ARGS_((TkWindow * winPtr, - XEvent * eventPtr)); +EXTERN void TkBindEventProc _ANSI_ARGS_((TkWindow *winPtr, + XEvent *eventPtr)); /* 5 */ -EXTERN void TkBindFree _ANSI_ARGS_((TkMainInfo * mainPtr)); +EXTERN void TkBindFree _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 6 */ -EXTERN void TkBindInit _ANSI_ARGS_((TkMainInfo * mainPtr)); +EXTERN void TkBindInit _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 7 */ -EXTERN void TkChangeEventWindow _ANSI_ARGS_((XEvent * eventPtr, - TkWindow * winPtr)); +EXTERN void TkChangeEventWindow _ANSI_ARGS_((XEvent *eventPtr, + TkWindow *winPtr)); /* 8 */ -EXTERN int TkClipInit _ANSI_ARGS_((Tcl_Interp * interp, - TkDisplay * dispPtr)); +EXTERN int TkClipInit _ANSI_ARGS_((Tcl_Interp *interp, + TkDisplay *dispPtr)); /* 9 */ -EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, - Tk_Window tkwin, int padX, int padY, - int innerWidth, int innerHeight, int * xPtr, - int * yPtr)); +EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, + Tk_Window tkwin, int padX, int padY, + int innerWidth, int innerHeight, int *xPtr, + int *yPtr)); /* 10 */ -EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp * interp, - char * script)); +EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, + char *script)); /* 11 */ EXTERN unsigned long TkCreateBindingProcedure _ANSI_ARGS_(( - Tcl_Interp * interp, - Tk_BindingTable bindingTable, - ClientData object, CONST char * eventString, - TkBindEvalProc * evalProc, - TkBindFreeProc * freeProc, + Tcl_Interp *interp, + Tk_BindingTable bindingTable, + ClientData object, CONST char *eventString, + TkBindEvalProc *evalProc, + TkBindFreeProc *freeProc, ClientData clientData)); /* 12 */ -EXTERN TkCursor * TkCreateCursorFromData _ANSI_ARGS_((Tk_Window tkwin, - CONST char * source, CONST char * mask, - int width, int height, int xHot, int yHot, +EXTERN TkCursor * TkCreateCursorFromData _ANSI_ARGS_((Tk_Window tkwin, + CONST char *source, CONST char *mask, + int width, int height, int xHot, int yHot, XColor fg, XColor bg)); /* 13 */ -EXTERN int TkCreateFrame _ANSI_ARGS_((ClientData clientData, - Tcl_Interp * interp, int argc, char ** argv, - int toplevel, char * appName)); +EXTERN int TkCreateFrame _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, int argc, char **argv, + int toplevel, char *appName)); /* 14 */ -EXTERN Tk_Window TkCreateMainWindow _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * screenName, char * baseName)); +EXTERN Tk_Window TkCreateMainWindow _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *screenName, char *baseName)); /* 15 */ -EXTERN Time TkCurrentTime _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN Time TkCurrentTime _ANSI_ARGS_((TkDisplay *dispPtr)); /* 16 */ -EXTERN void TkDeleteAllImages _ANSI_ARGS_((TkMainInfo * mainPtr)); +EXTERN void TkDeleteAllImages _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 17 */ -EXTERN void TkDoConfigureNotify _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkDoConfigureNotify _ANSI_ARGS_((TkWindow *winPtr)); /* 18 */ EXTERN void TkDrawInsetFocusHighlight _ANSI_ARGS_(( - Tk_Window tkwin, GC gc, int width, + Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding)); /* 19 */ -EXTERN void TkEventDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkEventDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 20 */ -EXTERN void TkFillPolygon _ANSI_ARGS_((Tk_Canvas canvas, - double * coordPtr, int numPoints, - Display * display, Drawable drawable, GC gc, +EXTERN void TkFillPolygon _ANSI_ARGS_((Tk_Canvas canvas, + double *coordPtr, int numPoints, + Display *display, Drawable drawable, GC gc, GC outlineGC)); /* 21 */ -EXTERN int TkFindStateNum _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * option, - CONST TkStateMap * mapPtr, - CONST char * strKey)); +EXTERN int TkFindStateNum _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *option, CONST TkStateMap *mapPtr, + CONST char *strKey)); /* 22 */ EXTERN char * TkFindStateString _ANSI_ARGS_(( - CONST TkStateMap * mapPtr, int numKey)); + CONST TkStateMap *mapPtr, int numKey)); /* 23 */ -EXTERN void TkFocusDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkFocusDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 24 */ -EXTERN int TkFocusFilterEvent _ANSI_ARGS_((TkWindow * winPtr, - XEvent * eventPtr)); +EXTERN int TkFocusFilterEvent _ANSI_ARGS_((TkWindow *winPtr, + XEvent *eventPtr)); /* 25 */ -EXTERN TkWindow * TkFocusKeyEvent _ANSI_ARGS_((TkWindow * winPtr, - XEvent * eventPtr)); +EXTERN TkWindow * TkFocusKeyEvent _ANSI_ARGS_((TkWindow *winPtr, + XEvent *eventPtr)); /* 26 */ -EXTERN void TkFontPkgInit _ANSI_ARGS_((TkMainInfo * mainPtr)); +EXTERN void TkFontPkgInit _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 27 */ -EXTERN void TkFontPkgFree _ANSI_ARGS_((TkMainInfo * mainPtr)); +EXTERN void TkFontPkgFree _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 28 */ -EXTERN void TkFreeBindingTags _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkFreeBindingTags _ANSI_ARGS_((TkWindow *winPtr)); /* 29 */ -EXTERN void TkpFreeCursor _ANSI_ARGS_((TkCursor * cursorPtr)); +EXTERN void TkpFreeCursor _ANSI_ARGS_((TkCursor *cursorPtr)); /* 30 */ -EXTERN char * TkGetBitmapData _ANSI_ARGS_((Tcl_Interp * interp, - char * string, char * fileName, - int * widthPtr, int * heightPtr, - int * hotXPtr, int * hotYPtr)); +EXTERN char * TkGetBitmapData _ANSI_ARGS_((Tcl_Interp *interp, + char *string, char *fileName, int *widthPtr, + int *heightPtr, int *hotXPtr, int *hotYPtr)); /* 31 */ -EXTERN void TkGetButtPoints _ANSI_ARGS_((double p1[], - double p2[], double width, int project, +EXTERN void TkGetButtPoints _ANSI_ARGS_((double p1[], + double p2[], double width, int project, double m1[], double m2[])); /* 32 */ -EXTERN TkCursor * TkGetCursorByName _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN TkCursor * TkGetCursorByName _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string)); /* 33 */ EXTERN CONST84_RETURN char * TkGetDefaultScreenName _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * screenName)); + Tcl_Interp *interp, CONST char *screenName)); /* 34 */ -EXTERN TkDisplay * TkGetDisplay _ANSI_ARGS_((Display * display)); +EXTERN TkDisplay * TkGetDisplay _ANSI_ARGS_((Display *display)); /* 35 */ -EXTERN int TkGetDisplayOf _ANSI_ARGS_((Tcl_Interp * interp, - int objc, Tcl_Obj *CONST objv[], - Tk_Window * tkwinPtr)); +EXTERN int TkGetDisplayOf _ANSI_ARGS_((Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[], + Tk_Window *tkwinPtr)); /* 36 */ -EXTERN TkWindow * TkGetFocusWin _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN TkWindow * TkGetFocusWin _ANSI_ARGS_((TkWindow *winPtr)); /* 37 */ -EXTERN int TkGetInterpNames _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN int TkGetInterpNames _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 38 */ -EXTERN int TkGetMiterPoints _ANSI_ARGS_((double p1[], - double p2[], double p3[], double width, +EXTERN int TkGetMiterPoints _ANSI_ARGS_((double p1[], + double p2[], double p3[], double width, double m1[], double m2[])); /* 39 */ -EXTERN void TkGetPointerCoords _ANSI_ARGS_((Tk_Window tkwin, - int * xPtr, int * yPtr)); +EXTERN void TkGetPointerCoords _ANSI_ARGS_((Tk_Window tkwin, + int *xPtr, int *yPtr)); /* 40 */ -EXTERN void TkGetServerInfo _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN void TkGetServerInfo _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 41 */ -EXTERN void TkGrabDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkGrabDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 42 */ -EXTERN int TkGrabState _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN int TkGrabState _ANSI_ARGS_((TkWindow *winPtr)); /* 43 */ -EXTERN void TkIncludePoint _ANSI_ARGS_((Tk_Item * itemPtr, - double * pointPtr)); +EXTERN void TkIncludePoint _ANSI_ARGS_((Tk_Item *itemPtr, + double *pointPtr)); /* 44 */ -EXTERN void TkInOutEvents _ANSI_ARGS_((XEvent * eventPtr, - TkWindow * sourcePtr, TkWindow * destPtr, - int leaveType, int enterType, +EXTERN void TkInOutEvents _ANSI_ARGS_((XEvent *eventPtr, + TkWindow *sourcePtr, TkWindow *destPtr, + int leaveType, int enterType, Tcl_QueuePosition position)); /* 45 */ EXTERN void TkInstallFrameMenu _ANSI_ARGS_((Tk_Window tkwin)); /* 46 */ EXTERN char * TkKeysymToString _ANSI_ARGS_((KeySym keysym)); /* 47 */ -EXTERN int TkLineToArea _ANSI_ARGS_((double end1Ptr[], +EXTERN int TkLineToArea _ANSI_ARGS_((double end1Ptr[], double end2Ptr[], double rectPtr[])); /* 48 */ -EXTERN double TkLineToPoint _ANSI_ARGS_((double end1Ptr[], +EXTERN double TkLineToPoint _ANSI_ARGS_((double end1Ptr[], double end2Ptr[], double pointPtr[])); /* 49 */ -EXTERN int TkMakeBezierCurve _ANSI_ARGS_((Tk_Canvas canvas, - double * pointPtr, int numPoints, - int numSteps, XPoint xPoints[], +EXTERN int TkMakeBezierCurve _ANSI_ARGS_((Tk_Canvas canvas, + double *pointPtr, int numPoints, + int numSteps, XPoint xPoints[], double dblPoints[])); /* 50 */ EXTERN void TkMakeBezierPostscript _ANSI_ARGS_(( - Tcl_Interp * interp, Tk_Canvas canvas, - double * pointPtr, int numPoints)); + Tcl_Interp *interp, Tk_Canvas canvas, + double *pointPtr, int numPoints)); /* 51 */ -EXTERN void TkOptionClassChanged _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkOptionClassChanged _ANSI_ARGS_((TkWindow *winPtr)); /* 52 */ -EXTERN void TkOptionDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkOptionDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 53 */ -EXTERN int TkOvalToArea _ANSI_ARGS_((double * ovalPtr, - double * rectPtr)); +EXTERN int TkOvalToArea _ANSI_ARGS_((double *ovalPtr, + double *rectPtr)); /* 54 */ -EXTERN double TkOvalToPoint _ANSI_ARGS_((double ovalPtr[], +EXTERN double TkOvalToPoint _ANSI_ARGS_((double ovalPtr[], double width, int filled, double pointPtr[])); /* 55 */ -EXTERN int TkpChangeFocus _ANSI_ARGS_((TkWindow * winPtr, +EXTERN int TkpChangeFocus _ANSI_ARGS_((TkWindow *winPtr, int force)); /* 56 */ -EXTERN void TkpCloseDisplay _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN void TkpCloseDisplay _ANSI_ARGS_((TkDisplay *dispPtr)); /* 57 */ -EXTERN void TkpClaimFocus _ANSI_ARGS_((TkWindow * topLevelPtr, +EXTERN void TkpClaimFocus _ANSI_ARGS_((TkWindow *topLevelPtr, int force)); /* 58 */ -EXTERN void TkpDisplayWarning _ANSI_ARGS_((CONST char * msg, - CONST char * title)); +EXTERN void TkpDisplayWarning _ANSI_ARGS_((CONST char *msg, + CONST char *title)); /* 59 */ -EXTERN void TkpGetAppName _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_DString * name)); +EXTERN void TkpGetAppName _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_DString *name)); /* 60 */ -EXTERN TkWindow * TkpGetOtherWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN TkWindow * TkpGetOtherWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 61 */ -EXTERN TkWindow * TkpGetWrapperWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN TkWindow * TkpGetWrapperWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 62 */ -EXTERN int TkpInit _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN int TkpInit _ANSI_ARGS_((Tcl_Interp *interp)); /* 63 */ EXTERN void TkpInitializeMenuBindings _ANSI_ARGS_(( - Tcl_Interp * interp, + Tcl_Interp *interp, Tk_BindingTable bindingTable)); /* 64 */ EXTERN void TkpMakeContainer _ANSI_ARGS_((Tk_Window tkwin)); /* 65 */ -EXTERN void TkpMakeMenuWindow _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void TkpMakeMenuWindow _ANSI_ARGS_((Tk_Window tkwin, int transient)); /* 66 */ -EXTERN Window TkpMakeWindow _ANSI_ARGS_((TkWindow * winPtr, +EXTERN Window TkpMakeWindow _ANSI_ARGS_((TkWindow *winPtr, Window parent)); /* 67 */ EXTERN void TkpMenuNotifyToplevelCreate _ANSI_ARGS_(( - Tcl_Interp * interp1, char * menuName)); + Tcl_Interp *interp1, char *menuName)); /* 68 */ -EXTERN TkDisplay * TkpOpenDisplay _ANSI_ARGS_(( - CONST char * display_name)); +EXTERN TkDisplay * TkpOpenDisplay _ANSI_ARGS_((CONST char *display_name)); /* 69 */ -EXTERN int TkPointerEvent _ANSI_ARGS_((XEvent * eventPtr, - TkWindow * winPtr)); +EXTERN int TkPointerEvent _ANSI_ARGS_((XEvent *eventPtr, + TkWindow *winPtr)); /* 70 */ -EXTERN int TkPolygonToArea _ANSI_ARGS_((double * polyPtr, - int numPoints, double * rectPtr)); +EXTERN int TkPolygonToArea _ANSI_ARGS_((double *polyPtr, + int numPoints, double *rectPtr)); /* 71 */ -EXTERN double TkPolygonToPoint _ANSI_ARGS_((double * polyPtr, - int numPoints, double * pointPtr)); +EXTERN double TkPolygonToPoint _ANSI_ARGS_((double *polyPtr, + int numPoints, double *pointPtr)); /* 72 */ -EXTERN int TkPositionInTree _ANSI_ARGS_((TkWindow * winPtr, - TkWindow * treePtr)); +EXTERN int TkPositionInTree _ANSI_ARGS_((TkWindow *winPtr, + TkWindow *treePtr)); /* 73 */ -EXTERN void TkpRedirectKeyEvent _ANSI_ARGS_((TkWindow * winPtr, - XEvent * eventPtr)); +EXTERN void TkpRedirectKeyEvent _ANSI_ARGS_((TkWindow *winPtr, + XEvent *eventPtr)); /* 74 */ -EXTERN void TkpSetMainMenubar _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, char * menuName)); +EXTERN void TkpSetMainMenubar _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, char *menuName)); /* 75 */ -EXTERN int TkpUseWindow _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, CONST char * string)); +EXTERN int TkpUseWindow _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, CONST char *string)); /* 76 */ -EXTERN int TkpWindowWasRecentlyDeleted _ANSI_ARGS_((Window win, - TkDisplay * dispPtr)); +EXTERN int TkpWindowWasRecentlyDeleted _ANSI_ARGS_((Window win, + TkDisplay *dispPtr)); /* 77 */ EXTERN void TkQueueEventForAllChildren _ANSI_ARGS_(( - TkWindow * winPtr, XEvent * eventPtr)); + TkWindow *winPtr, XEvent *eventPtr)); /* 78 */ -EXTERN int TkReadBitmapFile _ANSI_ARGS_((Display* display, - Drawable d, CONST char* filename, - unsigned int* width_return, - unsigned int* height_return, - Pixmap* bitmap_return, int* x_hot_return, - int* y_hot_return)); +EXTERN int TkReadBitmapFile _ANSI_ARGS_((Display*display, + Drawable d, CONST char*filename, + unsigned int*width_return, + unsigned int*height_return, + Pixmap*bitmap_return, int*x_hot_return, + int*y_hot_return)); /* 79 */ -EXTERN int TkScrollWindow _ANSI_ARGS_((Tk_Window tkwin, GC gc, - int x, int y, int width, int height, int dx, +EXTERN int TkScrollWindow _ANSI_ARGS_((Tk_Window tkwin, GC gc, + int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn)); /* 80 */ -EXTERN void TkSelDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkSelDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 81 */ -EXTERN void TkSelEventProc _ANSI_ARGS_((Tk_Window tkwin, - XEvent * eventPtr)); +EXTERN void TkSelEventProc _ANSI_ARGS_((Tk_Window tkwin, + XEvent *eventPtr)); /* 82 */ EXTERN void TkSelInit _ANSI_ARGS_((Tk_Window tkwin)); /* 83 */ -EXTERN void TkSelPropProc _ANSI_ARGS_((XEvent * eventPtr)); +EXTERN void TkSelPropProc _ANSI_ARGS_((XEvent *eventPtr)); /* Slot 84 is reserved */ /* 85 */ -EXTERN void TkSetWindowMenuBar _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, char * oldMenuName, - char * menuName)); +EXTERN void TkSetWindowMenuBar _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, char *oldMenuName, + char *menuName)); /* 86 */ -EXTERN KeySym TkStringToKeysym _ANSI_ARGS_((char * name)); +EXTERN KeySym TkStringToKeysym _ANSI_ARGS_((char *name)); /* 87 */ -EXTERN int TkThickPolyLineToArea _ANSI_ARGS_((double * coordPtr, - int numPoints, double width, int capStyle, - int joinStyle, double * rectPtr)); +EXTERN int TkThickPolyLineToArea _ANSI_ARGS_((double *coordPtr, + int numPoints, double width, int capStyle, + int joinStyle, double *rectPtr)); /* 88 */ EXTERN void TkWmAddToColormapWindows _ANSI_ARGS_(( - TkWindow * winPtr)); + TkWindow *winPtr)); /* 89 */ -EXTERN void TkWmDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkWmDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 90 */ -EXTERN TkWindow * TkWmFocusToplevel _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN TkWindow * TkWmFocusToplevel _ANSI_ARGS_((TkWindow *winPtr)); /* 91 */ -EXTERN void TkWmMapWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkWmMapWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 92 */ -EXTERN void TkWmNewWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkWmNewWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 93 */ -EXTERN void TkWmProtocolEventProc _ANSI_ARGS_((TkWindow * winPtr, - XEvent * evenvPtr)); +EXTERN void TkWmProtocolEventProc _ANSI_ARGS_((TkWindow *winPtr, + XEvent *evenvPtr)); /* 94 */ EXTERN void TkWmRemoveFromColormapWindows _ANSI_ARGS_(( - TkWindow * winPtr)); + TkWindow *winPtr)); /* 95 */ -EXTERN void TkWmRestackToplevel _ANSI_ARGS_((TkWindow * winPtr, - int aboveBelow, TkWindow * otherPtr)); +EXTERN void TkWmRestackToplevel _ANSI_ARGS_((TkWindow *winPtr, + int aboveBelow, TkWindow *otherPtr)); /* 96 */ -EXTERN void TkWmSetClass _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkWmSetClass _ANSI_ARGS_((TkWindow *winPtr)); /* 97 */ -EXTERN void TkWmUnmapWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkWmUnmapWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 98 */ -EXTERN Tcl_Obj * TkDebugBitmap _ANSI_ARGS_((Tk_Window tkwin, - char * name)); +EXTERN Tcl_Obj * TkDebugBitmap _ANSI_ARGS_((Tk_Window tkwin, + char *name)); /* 99 */ -EXTERN Tcl_Obj * TkDebugBorder _ANSI_ARGS_((Tk_Window tkwin, - char * name)); +EXTERN Tcl_Obj * TkDebugBorder _ANSI_ARGS_((Tk_Window tkwin, + char *name)); /* 100 */ -EXTERN Tcl_Obj * TkDebugCursor _ANSI_ARGS_((Tk_Window tkwin, - char * name)); +EXTERN Tcl_Obj * TkDebugCursor _ANSI_ARGS_((Tk_Window tkwin, + char *name)); /* 101 */ -EXTERN Tcl_Obj * TkDebugColor _ANSI_ARGS_((Tk_Window tkwin, - char * name)); +EXTERN Tcl_Obj * TkDebugColor _ANSI_ARGS_((Tk_Window tkwin, + char *name)); /* 102 */ -EXTERN Tcl_Obj * TkDebugConfig _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN Tcl_Obj * TkDebugConfig _ANSI_ARGS_((Tcl_Interp *interp, Tk_OptionTable table)); /* 103 */ -EXTERN Tcl_Obj * TkDebugFont _ANSI_ARGS_((Tk_Window tkwin, - char * name)); +EXTERN Tcl_Obj * TkDebugFont _ANSI_ARGS_((Tk_Window tkwin, char *name)); /* 104 */ -EXTERN int TkFindStateNumObj _ANSI_ARGS_((Tcl_Interp * interp, - Tcl_Obj * optionPtr, - CONST TkStateMap * mapPtr, Tcl_Obj * keyPtr)); +EXTERN int TkFindStateNumObj _ANSI_ARGS_((Tcl_Interp *interp, + Tcl_Obj *optionPtr, CONST TkStateMap *mapPtr, + Tcl_Obj *keyPtr)); /* 105 */ EXTERN Tcl_HashTable * TkGetBitmapPredefTable _ANSI_ARGS_((void)); /* 106 */ @@ -352,34 +348,34 @@ EXTERN TkDisplay * TkGetDisplayList _ANSI_ARGS_((void)); /* 107 */ EXTERN TkMainInfo * TkGetMainInfoList _ANSI_ARGS_((void)); /* 108 */ -EXTERN int TkGetWindowFromObj _ANSI_ARGS_((Tcl_Interp * interp, - Tk_Window tkwin, Tcl_Obj * objPtr, - Tk_Window * windowPtr)); +EXTERN int TkGetWindowFromObj _ANSI_ARGS_((Tcl_Interp *interp, + Tk_Window tkwin, Tcl_Obj *objPtr, + Tk_Window *windowPtr)); /* 109 */ -EXTERN char * TkpGetString _ANSI_ARGS_((TkWindow * winPtr, - XEvent * eventPtr, Tcl_DString * dsPtr)); +EXTERN char * TkpGetString _ANSI_ARGS_((TkWindow *winPtr, + XEvent *eventPtr, Tcl_DString *dsPtr)); /* 110 */ -EXTERN void TkpGetSubFonts _ANSI_ARGS_((Tcl_Interp * interp, +EXTERN void TkpGetSubFonts _ANSI_ARGS_((Tcl_Interp *interp, Tk_Font tkfont)); /* 111 */ -EXTERN Tcl_Obj * TkpGetSystemDefault _ANSI_ARGS_((Tk_Window tkwin, - CONST char * dbName, CONST char * className)); +EXTERN Tcl_Obj * TkpGetSystemDefault _ANSI_ARGS_((Tk_Window tkwin, + CONST char *dbName, CONST char *className)); /* 112 */ EXTERN void TkpMenuThreadInit _ANSI_ARGS_((void)); #ifdef __WIN32__ /* 113 */ -EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle* rect_return)); +EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, + XRectangle*rect_return)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 113 */ -EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle* rect_return)); +EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, + XRectangle*rect_return)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 113 */ -EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle* rect_return)); +EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, + XRectangle*rect_return)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 114 */ @@ -407,77 +403,77 @@ EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 116 */ -EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, +EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 116 */ -EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, +EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 116 */ -EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, +EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 117 */ -EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, - int y, unsigned int width, +EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, + int y, unsigned int width, unsigned int height)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 117 */ -EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, - int y, unsigned int width, +EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, + int y, unsigned int width, unsigned int height)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 117 */ -EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, - int y, unsigned int width, +EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, + int y, unsigned int width, unsigned int height)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); #endif /* MAC_OSX_TK */ /* Slot 120 is reserved */ #ifdef MAC_TCL /* 121 */ -EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, - CONST char * source)); +EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display *display, + CONST char *source)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 121 */ -EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, - CONST char * source)); +EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display *display, + CONST char *source)); #endif /* MAC_OSX_TK */ #ifdef MAC_TCL /* 122 */ @@ -490,13 +486,13 @@ EXTERN void TkpDefineNativeBitmaps _ANSI_ARGS_((void)); /* Slot 123 is reserved */ #ifdef MAC_TCL /* 124 */ -EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, - CONST char * name, int * width, int * height)); +EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display *display, + CONST char *name, int *width, int *height)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 124 */ -EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, - CONST char * name, int * width, int * height)); +EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display *display, + CONST char *name, int *width, int *height)); #endif /* MAC_OSX_TK */ /* Slot 125 is reserved */ /* Slot 126 is reserved */ @@ -509,195 +505,195 @@ EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, /* Slot 133 is reserved */ /* Slot 134 is reserved */ /* 135 */ -EXTERN void TkpDrawHighlightBorder _ANSI_ARGS_((Tk_Window tkwin, - GC fgGC, GC bgGC, int highlightWidth, +EXTERN void TkpDrawHighlightBorder _ANSI_ARGS_((Tk_Window tkwin, + GC fgGC, GC bgGC, int highlightWidth, Drawable drawable)); /* 136 */ -EXTERN void TkSetFocusWin _ANSI_ARGS_((TkWindow * winPtr, +EXTERN void TkSetFocusWin _ANSI_ARGS_((TkWindow *winPtr, int force)); /* 137 */ -EXTERN void TkpSetKeycodeAndState _ANSI_ARGS_((Tk_Window tkwin, - KeySym keySym, XEvent * eventPtr)); +EXTERN void TkpSetKeycodeAndState _ANSI_ARGS_((Tk_Window tkwin, + KeySym keySym, XEvent *eventPtr)); /* 138 */ -EXTERN KeySym TkpGetKeySym _ANSI_ARGS_((TkDisplay * dispPtr, - XEvent * eventPtr)); +EXTERN KeySym TkpGetKeySym _ANSI_ARGS_((TkDisplay *dispPtr, + XEvent *eventPtr)); /* 139 */ -EXTERN void TkpInitKeymapInfo _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN void TkpInitKeymapInfo _ANSI_ARGS_((TkDisplay *dispPtr)); /* 140 */ EXTERN TkRegion TkPhotoGetValidRegion _ANSI_ARGS_(( Tk_PhotoHandle handle)); /* 141 */ EXTERN TkWindow ** TkWmStackorderToplevel _ANSI_ARGS_(( - TkWindow * parentPtr)); + TkWindow *parentPtr)); /* 142 */ -EXTERN void TkFocusFree _ANSI_ARGS_((TkMainInfo * mainPtr)); +EXTERN void TkFocusFree _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 143 */ -EXTERN void TkClipCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN void TkClipCleanup _ANSI_ARGS_((TkDisplay *dispPtr)); /* 144 */ -EXTERN void TkGCCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN void TkGCCleanup _ANSI_ARGS_((TkDisplay *dispPtr)); #ifdef __WIN32__ /* 145 */ -EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, +EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 145 */ -EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, +EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 145 */ -EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, +EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); #endif /* MAC_OSX_TK */ /* 146 */ -EXTERN void TkStylePkgInit _ANSI_ARGS_((TkMainInfo * mainPtr)); +EXTERN void TkStylePkgInit _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 147 */ -EXTERN void TkStylePkgFree _ANSI_ARGS_((TkMainInfo * mainPtr)); +EXTERN void TkStylePkgFree _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 148 */ EXTERN Tk_Window TkToplevelWindowForCommand _ANSI_ARGS_(( - Tcl_Interp * interp, CONST char * cmdName)); + Tcl_Interp *interp, CONST char *cmdName)); /* 149 */ -EXTERN CONST Tk_OptionSpec * TkGetOptionSpec _ANSI_ARGS_((CONST char * name, +EXTERN CONST Tk_OptionSpec * TkGetOptionSpec _ANSI_ARGS_((CONST char *name, Tk_OptionTable optionTable)); /* Slot 150 is reserved */ /* Slot 151 is reserved */ /* 152 */ -EXTERN void TkpDrawFrame _ANSI_ARGS_((Tk_Window tkwin, - Tk_3DBorder border, int highlightWidth, +EXTERN void TkpDrawFrame _ANSI_ARGS_((Tk_Window tkwin, + Tk_3DBorder border, int highlightWidth, int borderWidth, int relief)); typedef struct TkIntStubs { int magic; struct TkIntStubHooks *hooks; - TkWindow * (*tkAllocWindow) _ANSI_ARGS_((TkDisplay * dispPtr, int screenNum, TkWindow * parentPtr)); /* 0 */ - void (*tkBezierPoints) _ANSI_ARGS_((double control[], int numSteps, double * coordPtr)); /* 1 */ - void (*tkBezierScreenPoints) _ANSI_ARGS_((Tk_Canvas canvas, double control[], int numSteps, XPoint * xPointPtr)); /* 2 */ - void (*tkBindDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 3 */ - void (*tkBindEventProc) _ANSI_ARGS_((TkWindow * winPtr, XEvent * eventPtr)); /* 4 */ - void (*tkBindFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 5 */ - void (*tkBindInit) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 6 */ - void (*tkChangeEventWindow) _ANSI_ARGS_((XEvent * eventPtr, TkWindow * winPtr)); /* 7 */ - int (*tkClipInit) _ANSI_ARGS_((Tcl_Interp * interp, TkDisplay * dispPtr)); /* 8 */ - void (*tkComputeAnchor) _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, int innerWidth, int innerHeight, int * xPtr, int * yPtr)); /* 9 */ - int (*tkCopyAndGlobalEval) _ANSI_ARGS_((Tcl_Interp * interp, char * script)); /* 10 */ - unsigned long (*tkCreateBindingProcedure) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventString, TkBindEvalProc * evalProc, TkBindFreeProc * freeProc, ClientData clientData)); /* 11 */ - TkCursor * (*tkCreateCursorFromData) _ANSI_ARGS_((Tk_Window tkwin, CONST char * source, CONST char * mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg)); /* 12 */ - int (*tkCreateFrame) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int argc, char ** argv, int toplevel, char * appName)); /* 13 */ - Tk_Window (*tkCreateMainWindow) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * screenName, char * baseName)); /* 14 */ - Time (*tkCurrentTime) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 15 */ - void (*tkDeleteAllImages) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 16 */ - void (*tkDoConfigureNotify) _ANSI_ARGS_((TkWindow * winPtr)); /* 17 */ + TkWindow * (*tkAllocWindow) _ANSI_ARGS_((TkDisplay *dispPtr, int screenNum, TkWindow *parentPtr)); /* 0 */ + void (*tkBezierPoints) _ANSI_ARGS_((double control[], int numSteps, double *coordPtr)); /* 1 */ + void (*tkBezierScreenPoints) _ANSI_ARGS_((Tk_Canvas canvas, double control[], int numSteps, XPoint *xPointPtr)); /* 2 */ + void (*tkBindDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 3 */ + void (*tkBindEventProc) _ANSI_ARGS_((TkWindow *winPtr, XEvent *eventPtr)); /* 4 */ + void (*tkBindFree) _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 5 */ + void (*tkBindInit) _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 6 */ + void (*tkChangeEventWindow) _ANSI_ARGS_((XEvent *eventPtr, TkWindow *winPtr)); /* 7 */ + int (*tkClipInit) _ANSI_ARGS_((Tcl_Interp *interp, TkDisplay *dispPtr)); /* 8 */ + void (*tkComputeAnchor) _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, int innerWidth, int innerHeight, int *xPtr, int *yPtr)); /* 9 */ + int (*tkCopyAndGlobalEval) _ANSI_ARGS_((Tcl_Interp *interp, char *script)); /* 10 */ + unsigned long (*tkCreateBindingProcedure) _ANSI_ARGS_((Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventString, TkBindEvalProc *evalProc, TkBindFreeProc *freeProc, ClientData clientData)); /* 11 */ + TkCursor * (*tkCreateCursorFromData) _ANSI_ARGS_((Tk_Window tkwin, CONST char *source, CONST char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg)); /* 12 */ + int (*tkCreateFrame) _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, char **argv, int toplevel, char *appName)); /* 13 */ + Tk_Window (*tkCreateMainWindow) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *screenName, char *baseName)); /* 14 */ + Time (*tkCurrentTime) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 15 */ + void (*tkDeleteAllImages) _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 16 */ + void (*tkDoConfigureNotify) _ANSI_ARGS_((TkWindow *winPtr)); /* 17 */ void (*tkDrawInsetFocusHighlight) _ANSI_ARGS_((Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding)); /* 18 */ - void (*tkEventDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 19 */ - void (*tkFillPolygon) _ANSI_ARGS_((Tk_Canvas canvas, double * coordPtr, int numPoints, Display * display, Drawable drawable, GC gc, GC outlineGC)); /* 20 */ - int (*tkFindStateNum) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * option, CONST TkStateMap * mapPtr, CONST char * strKey)); /* 21 */ - char * (*tkFindStateString) _ANSI_ARGS_((CONST TkStateMap * mapPtr, int numKey)); /* 22 */ - void (*tkFocusDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 23 */ - int (*tkFocusFilterEvent) _ANSI_ARGS_((TkWindow * winPtr, XEvent * eventPtr)); /* 24 */ - TkWindow * (*tkFocusKeyEvent) _ANSI_ARGS_((TkWindow * winPtr, XEvent * eventPtr)); /* 25 */ - void (*tkFontPkgInit) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 26 */ - void (*tkFontPkgFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 27 */ - void (*tkFreeBindingTags) _ANSI_ARGS_((TkWindow * winPtr)); /* 28 */ - void (*tkpFreeCursor) _ANSI_ARGS_((TkCursor * cursorPtr)); /* 29 */ - char * (*tkGetBitmapData) _ANSI_ARGS_((Tcl_Interp * interp, char * string, char * fileName, int * widthPtr, int * heightPtr, int * hotXPtr, int * hotYPtr)); /* 30 */ + void (*tkEventDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 19 */ + void (*tkFillPolygon) _ANSI_ARGS_((Tk_Canvas canvas, double *coordPtr, int numPoints, Display *display, Drawable drawable, GC gc, GC outlineGC)); /* 20 */ + int (*tkFindStateNum) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *option, CONST TkStateMap *mapPtr, CONST char *strKey)); /* 21 */ + char * (*tkFindStateString) _ANSI_ARGS_((CONST TkStateMap *mapPtr, int numKey)); /* 22 */ + void (*tkFocusDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 23 */ + int (*tkFocusFilterEvent) _ANSI_ARGS_((TkWindow *winPtr, XEvent *eventPtr)); /* 24 */ + TkWindow * (*tkFocusKeyEvent) _ANSI_ARGS_((TkWindow *winPtr, XEvent *eventPtr)); /* 25 */ + void (*tkFontPkgInit) _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 26 */ + void (*tkFontPkgFree) _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 27 */ + void (*tkFreeBindingTags) _ANSI_ARGS_((TkWindow *winPtr)); /* 28 */ + void (*tkpFreeCursor) _ANSI_ARGS_((TkCursor *cursorPtr)); /* 29 */ + char * (*tkGetBitmapData) _ANSI_ARGS_((Tcl_Interp *interp, char *string, char *fileName, int *widthPtr, int *heightPtr, int *hotXPtr, int *hotYPtr)); /* 30 */ void (*tkGetButtPoints) _ANSI_ARGS_((double p1[], double p2[], double width, int project, double m1[], double m2[])); /* 31 */ - TkCursor * (*tkGetCursorByName) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid string)); /* 32 */ - CONST84_RETURN char * (*tkGetDefaultScreenName) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * screenName)); /* 33 */ - TkDisplay * (*tkGetDisplay) _ANSI_ARGS_((Display * display)); /* 34 */ - int (*tkGetDisplayOf) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], Tk_Window * tkwinPtr)); /* 35 */ - TkWindow * (*tkGetFocusWin) _ANSI_ARGS_((TkWindow * winPtr)); /* 36 */ - int (*tkGetInterpNames) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin)); /* 37 */ + TkCursor * (*tkGetCursorByName) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string)); /* 32 */ + CONST84_RETURN char * (*tkGetDefaultScreenName) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *screenName)); /* 33 */ + TkDisplay * (*tkGetDisplay) _ANSI_ARGS_((Display *display)); /* 34 */ + int (*tkGetDisplayOf) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Tk_Window *tkwinPtr)); /* 35 */ + TkWindow * (*tkGetFocusWin) _ANSI_ARGS_((TkWindow *winPtr)); /* 36 */ + int (*tkGetInterpNames) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 37 */ int (*tkGetMiterPoints) _ANSI_ARGS_((double p1[], double p2[], double p3[], double width, double m1[], double m2[])); /* 38 */ - void (*tkGetPointerCoords) _ANSI_ARGS_((Tk_Window tkwin, int * xPtr, int * yPtr)); /* 39 */ - void (*tkGetServerInfo) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin)); /* 40 */ - void (*tkGrabDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 41 */ - int (*tkGrabState) _ANSI_ARGS_((TkWindow * winPtr)); /* 42 */ - void (*tkIncludePoint) _ANSI_ARGS_((Tk_Item * itemPtr, double * pointPtr)); /* 43 */ - void (*tkInOutEvents) _ANSI_ARGS_((XEvent * eventPtr, TkWindow * sourcePtr, TkWindow * destPtr, int leaveType, int enterType, Tcl_QueuePosition position)); /* 44 */ + void (*tkGetPointerCoords) _ANSI_ARGS_((Tk_Window tkwin, int *xPtr, int *yPtr)); /* 39 */ + void (*tkGetServerInfo) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 40 */ + void (*tkGrabDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 41 */ + int (*tkGrabState) _ANSI_ARGS_((TkWindow *winPtr)); /* 42 */ + void (*tkIncludePoint) _ANSI_ARGS_((Tk_Item *itemPtr, double *pointPtr)); /* 43 */ + void (*tkInOutEvents) _ANSI_ARGS_((XEvent *eventPtr, TkWindow *sourcePtr, TkWindow *destPtr, int leaveType, int enterType, Tcl_QueuePosition position)); /* 44 */ void (*tkInstallFrameMenu) _ANSI_ARGS_((Tk_Window tkwin)); /* 45 */ char * (*tkKeysymToString) _ANSI_ARGS_((KeySym keysym)); /* 46 */ int (*tkLineToArea) _ANSI_ARGS_((double end1Ptr[], double end2Ptr[], double rectPtr[])); /* 47 */ double (*tkLineToPoint) _ANSI_ARGS_((double end1Ptr[], double end2Ptr[], double pointPtr[])); /* 48 */ - int (*tkMakeBezierCurve) _ANSI_ARGS_((Tk_Canvas canvas, double * pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[])); /* 49 */ - void (*tkMakeBezierPostscript) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, double * pointPtr, int numPoints)); /* 50 */ - void (*tkOptionClassChanged) _ANSI_ARGS_((TkWindow * winPtr)); /* 51 */ - void (*tkOptionDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 52 */ - int (*tkOvalToArea) _ANSI_ARGS_((double * ovalPtr, double * rectPtr)); /* 53 */ + int (*tkMakeBezierCurve) _ANSI_ARGS_((Tk_Canvas canvas, double *pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[])); /* 49 */ + void (*tkMakeBezierPostscript) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints)); /* 50 */ + void (*tkOptionClassChanged) _ANSI_ARGS_((TkWindow *winPtr)); /* 51 */ + void (*tkOptionDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 52 */ + int (*tkOvalToArea) _ANSI_ARGS_((double *ovalPtr, double *rectPtr)); /* 53 */ double (*tkOvalToPoint) _ANSI_ARGS_((double ovalPtr[], double width, int filled, double pointPtr[])); /* 54 */ - int (*tkpChangeFocus) _ANSI_ARGS_((TkWindow * winPtr, int force)); /* 55 */ - void (*tkpCloseDisplay) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 56 */ - void (*tkpClaimFocus) _ANSI_ARGS_((TkWindow * topLevelPtr, int force)); /* 57 */ - void (*tkpDisplayWarning) _ANSI_ARGS_((CONST char * msg, CONST char * title)); /* 58 */ - void (*tkpGetAppName) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * name)); /* 59 */ - TkWindow * (*tkpGetOtherWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 60 */ - TkWindow * (*tkpGetWrapperWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 61 */ - int (*tkpInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 62 */ - void (*tkpInitializeMenuBindings) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable)); /* 63 */ + int (*tkpChangeFocus) _ANSI_ARGS_((TkWindow *winPtr, int force)); /* 55 */ + void (*tkpCloseDisplay) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 56 */ + void (*tkpClaimFocus) _ANSI_ARGS_((TkWindow *topLevelPtr, int force)); /* 57 */ + void (*tkpDisplayWarning) _ANSI_ARGS_((CONST char *msg, CONST char *title)); /* 58 */ + void (*tkpGetAppName) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_DString *name)); /* 59 */ + TkWindow * (*tkpGetOtherWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 60 */ + TkWindow * (*tkpGetWrapperWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 61 */ + int (*tkpInit) _ANSI_ARGS_((Tcl_Interp *interp)); /* 62 */ + void (*tkpInitializeMenuBindings) _ANSI_ARGS_((Tcl_Interp *interp, Tk_BindingTable bindingTable)); /* 63 */ void (*tkpMakeContainer) _ANSI_ARGS_((Tk_Window tkwin)); /* 64 */ void (*tkpMakeMenuWindow) _ANSI_ARGS_((Tk_Window tkwin, int transient)); /* 65 */ - Window (*tkpMakeWindow) _ANSI_ARGS_((TkWindow * winPtr, Window parent)); /* 66 */ - void (*tkpMenuNotifyToplevelCreate) _ANSI_ARGS_((Tcl_Interp * interp1, char * menuName)); /* 67 */ - TkDisplay * (*tkpOpenDisplay) _ANSI_ARGS_((CONST char * display_name)); /* 68 */ - int (*tkPointerEvent) _ANSI_ARGS_((XEvent * eventPtr, TkWindow * winPtr)); /* 69 */ - int (*tkPolygonToArea) _ANSI_ARGS_((double * polyPtr, int numPoints, double * rectPtr)); /* 70 */ - double (*tkPolygonToPoint) _ANSI_ARGS_((double * polyPtr, int numPoints, double * pointPtr)); /* 71 */ - int (*tkPositionInTree) _ANSI_ARGS_((TkWindow * winPtr, TkWindow * treePtr)); /* 72 */ - void (*tkpRedirectKeyEvent) _ANSI_ARGS_((TkWindow * winPtr, XEvent * eventPtr)); /* 73 */ - void (*tkpSetMainMenubar) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, char * menuName)); /* 74 */ - int (*tkpUseWindow) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * string)); /* 75 */ - int (*tkpWindowWasRecentlyDeleted) _ANSI_ARGS_((Window win, TkDisplay * dispPtr)); /* 76 */ - void (*tkQueueEventForAllChildren) _ANSI_ARGS_((TkWindow * winPtr, XEvent * eventPtr)); /* 77 */ - int (*tkReadBitmapFile) _ANSI_ARGS_((Display* display, Drawable d, CONST char* filename, unsigned int* width_return, unsigned int* height_return, Pixmap* bitmap_return, int* x_hot_return, int* y_hot_return)); /* 78 */ + Window (*tkpMakeWindow) _ANSI_ARGS_((TkWindow *winPtr, Window parent)); /* 66 */ + void (*tkpMenuNotifyToplevelCreate) _ANSI_ARGS_((Tcl_Interp *interp1, char *menuName)); /* 67 */ + TkDisplay * (*tkpOpenDisplay) _ANSI_ARGS_((CONST char *display_name)); /* 68 */ + int (*tkPointerEvent) _ANSI_ARGS_((XEvent *eventPtr, TkWindow *winPtr)); /* 69 */ + int (*tkPolygonToArea) _ANSI_ARGS_((double *polyPtr, int numPoints, double *rectPtr)); /* 70 */ + double (*tkPolygonToPoint) _ANSI_ARGS_((double *polyPtr, int numPoints, double *pointPtr)); /* 71 */ + int (*tkPositionInTree) _ANSI_ARGS_((TkWindow *winPtr, TkWindow *treePtr)); /* 72 */ + void (*tkpRedirectKeyEvent) _ANSI_ARGS_((TkWindow *winPtr, XEvent *eventPtr)); /* 73 */ + void (*tkpSetMainMenubar) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, char *menuName)); /* 74 */ + int (*tkpUseWindow) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *string)); /* 75 */ + int (*tkpWindowWasRecentlyDeleted) _ANSI_ARGS_((Window win, TkDisplay *dispPtr)); /* 76 */ + void (*tkQueueEventForAllChildren) _ANSI_ARGS_((TkWindow *winPtr, XEvent *eventPtr)); /* 77 */ + int (*tkReadBitmapFile) _ANSI_ARGS_((Display*display, Drawable d, CONST char*filename, unsigned int*width_return, unsigned int*height_return, Pixmap*bitmap_return, int*x_hot_return, int*y_hot_return)); /* 78 */ int (*tkScrollWindow) _ANSI_ARGS_((Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn)); /* 79 */ - void (*tkSelDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 80 */ - void (*tkSelEventProc) _ANSI_ARGS_((Tk_Window tkwin, XEvent * eventPtr)); /* 81 */ + void (*tkSelDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 80 */ + void (*tkSelEventProc) _ANSI_ARGS_((Tk_Window tkwin, XEvent *eventPtr)); /* 81 */ void (*tkSelInit) _ANSI_ARGS_((Tk_Window tkwin)); /* 82 */ - void (*tkSelPropProc) _ANSI_ARGS_((XEvent * eventPtr)); /* 83 */ - void *reserved84; - void (*tkSetWindowMenuBar) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, char * oldMenuName, char * menuName)); /* 85 */ - KeySym (*tkStringToKeysym) _ANSI_ARGS_((char * name)); /* 86 */ - int (*tkThickPolyLineToArea) _ANSI_ARGS_((double * coordPtr, int numPoints, double width, int capStyle, int joinStyle, double * rectPtr)); /* 87 */ - void (*tkWmAddToColormapWindows) _ANSI_ARGS_((TkWindow * winPtr)); /* 88 */ - void (*tkWmDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 89 */ - TkWindow * (*tkWmFocusToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 90 */ - void (*tkWmMapWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 91 */ - void (*tkWmNewWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 92 */ - void (*tkWmProtocolEventProc) _ANSI_ARGS_((TkWindow * winPtr, XEvent * evenvPtr)); /* 93 */ - void (*tkWmRemoveFromColormapWindows) _ANSI_ARGS_((TkWindow * winPtr)); /* 94 */ - void (*tkWmRestackToplevel) _ANSI_ARGS_((TkWindow * winPtr, int aboveBelow, TkWindow * otherPtr)); /* 95 */ - void (*tkWmSetClass) _ANSI_ARGS_((TkWindow * winPtr)); /* 96 */ - void (*tkWmUnmapWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 97 */ - Tcl_Obj * (*tkDebugBitmap) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 98 */ - Tcl_Obj * (*tkDebugBorder) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 99 */ - Tcl_Obj * (*tkDebugCursor) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 100 */ - Tcl_Obj * (*tkDebugColor) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 101 */ - Tcl_Obj * (*tkDebugConfig) _ANSI_ARGS_((Tcl_Interp * interp, Tk_OptionTable table)); /* 102 */ - Tcl_Obj * (*tkDebugFont) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 103 */ - int (*tkFindStateNumObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * optionPtr, CONST TkStateMap * mapPtr, Tcl_Obj * keyPtr)); /* 104 */ + void (*tkSelPropProc) _ANSI_ARGS_((XEvent *eventPtr)); /* 83 */ + VOID *reserved84; + void (*tkSetWindowMenuBar) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, char *oldMenuName, char *menuName)); /* 85 */ + KeySym (*tkStringToKeysym) _ANSI_ARGS_((char *name)); /* 86 */ + int (*tkThickPolyLineToArea) _ANSI_ARGS_((double *coordPtr, int numPoints, double width, int capStyle, int joinStyle, double *rectPtr)); /* 87 */ + void (*tkWmAddToColormapWindows) _ANSI_ARGS_((TkWindow *winPtr)); /* 88 */ + void (*tkWmDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 89 */ + TkWindow * (*tkWmFocusToplevel) _ANSI_ARGS_((TkWindow *winPtr)); /* 90 */ + void (*tkWmMapWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 91 */ + void (*tkWmNewWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 92 */ + void (*tkWmProtocolEventProc) _ANSI_ARGS_((TkWindow *winPtr, XEvent *evenvPtr)); /* 93 */ + void (*tkWmRemoveFromColormapWindows) _ANSI_ARGS_((TkWindow *winPtr)); /* 94 */ + void (*tkWmRestackToplevel) _ANSI_ARGS_((TkWindow *winPtr, int aboveBelow, TkWindow *otherPtr)); /* 95 */ + void (*tkWmSetClass) _ANSI_ARGS_((TkWindow *winPtr)); /* 96 */ + void (*tkWmUnmapWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 97 */ + Tcl_Obj * (*tkDebugBitmap) _ANSI_ARGS_((Tk_Window tkwin, char *name)); /* 98 */ + Tcl_Obj * (*tkDebugBorder) _ANSI_ARGS_((Tk_Window tkwin, char *name)); /* 99 */ + Tcl_Obj * (*tkDebugCursor) _ANSI_ARGS_((Tk_Window tkwin, char *name)); /* 100 */ + Tcl_Obj * (*tkDebugColor) _ANSI_ARGS_((Tk_Window tkwin, char *name)); /* 101 */ + Tcl_Obj * (*tkDebugConfig) _ANSI_ARGS_((Tcl_Interp *interp, Tk_OptionTable table)); /* 102 */ + Tcl_Obj * (*tkDebugFont) _ANSI_ARGS_((Tk_Window tkwin, char *name)); /* 103 */ + int (*tkFindStateNumObj) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *optionPtr, CONST TkStateMap *mapPtr, Tcl_Obj *keyPtr)); /* 104 */ Tcl_HashTable * (*tkGetBitmapPredefTable) _ANSI_ARGS_((void)); /* 105 */ TkDisplay * (*tkGetDisplayList) _ANSI_ARGS_((void)); /* 106 */ TkMainInfo * (*tkGetMainInfoList) _ANSI_ARGS_((void)); /* 107 */ - int (*tkGetWindowFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr, Tk_Window * windowPtr)); /* 108 */ - char * (*tkpGetString) _ANSI_ARGS_((TkWindow * winPtr, XEvent * eventPtr, Tcl_DString * dsPtr)); /* 109 */ - void (*tkpGetSubFonts) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Font tkfont)); /* 110 */ - Tcl_Obj * (*tkpGetSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, CONST char * dbName, CONST char * className)); /* 111 */ + int (*tkGetWindowFromObj) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, Tk_Window *windowPtr)); /* 108 */ + char * (*tkpGetString) _ANSI_ARGS_((TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr)); /* 109 */ + void (*tkpGetSubFonts) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Font tkfont)); /* 110 */ + Tcl_Obj * (*tkpGetSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, CONST char *dbName, CONST char *className)); /* 111 */ void (*tkpMenuThreadInit) _ANSI_ARGS_((void)); /* 112 */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved113; + VOID *reserved113; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved114; + VOID *reserved114; #endif /* UNIX */ #ifdef __WIN32__ TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */ @@ -709,7 +705,7 @@ typedef struct TkIntStubs { TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved115; + VOID *reserved115; #endif /* UNIX */ #ifdef __WIN32__ void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */ @@ -721,7 +717,7 @@ typedef struct TkIntStubs { void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved116; + VOID *reserved116; #endif /* UNIX */ #ifdef __WIN32__ void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */ @@ -733,7 +729,7 @@ typedef struct TkIntStubs { void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved117; + VOID *reserved117; #endif /* UNIX */ #ifdef __WIN32__ int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */ @@ -745,47 +741,47 @@ typedef struct TkIntStubs { int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved118; + VOID *reserved118; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved119; + VOID *reserved119; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* MAC_OSX_TK */ - void *reserved120; + VOID *reserved120; #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved121; + VOID *reserved121; #endif /* UNIX */ #ifdef __WIN32__ - void *reserved121; + VOID *reserved121; #endif /* __WIN32__ */ #ifdef MAC_TCL - Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, CONST char * source)); /* 121 */ + Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display *display, CONST char *source)); /* 121 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, CONST char * source)); /* 121 */ + Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display *display, CONST char *source)); /* 121 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved122; + VOID *reserved122; #endif /* UNIX */ #ifdef __WIN32__ - void *reserved122; + VOID *reserved122; #endif /* __WIN32__ */ #ifdef MAC_TCL void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */ @@ -793,41 +789,41 @@ typedef struct TkIntStubs { #ifdef MAC_OSX_TK void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */ #endif /* MAC_OSX_TK */ - void *reserved123; + VOID *reserved123; #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved124; + VOID *reserved124; #endif /* UNIX */ #ifdef __WIN32__ - void *reserved124; + VOID *reserved124; #endif /* __WIN32__ */ #ifdef MAC_TCL - Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 124 */ + Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display *display, CONST char *name, int *width, int *height)); /* 124 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 124 */ + Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display *display, CONST char *name, int *width, int *height)); /* 124 */ #endif /* MAC_OSX_TK */ - void *reserved125; - void *reserved126; - void *reserved127; - void *reserved128; - void *reserved129; - void *reserved130; - void *reserved131; - void *reserved132; - void *reserved133; - void *reserved134; + VOID *reserved125; + VOID *reserved126; + VOID *reserved127; + VOID *reserved128; + VOID *reserved129; + VOID *reserved130; + VOID *reserved131; + VOID *reserved132; + VOID *reserved133; + VOID *reserved134; void (*tkpDrawHighlightBorder) _ANSI_ARGS_((Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable)); /* 135 */ - void (*tkSetFocusWin) _ANSI_ARGS_((TkWindow * winPtr, int force)); /* 136 */ - void (*tkpSetKeycodeAndState) _ANSI_ARGS_((Tk_Window tkwin, KeySym keySym, XEvent * eventPtr)); /* 137 */ - KeySym (*tkpGetKeySym) _ANSI_ARGS_((TkDisplay * dispPtr, XEvent * eventPtr)); /* 138 */ - void (*tkpInitKeymapInfo) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 139 */ + void (*tkSetFocusWin) _ANSI_ARGS_((TkWindow *winPtr, int force)); /* 136 */ + void (*tkpSetKeycodeAndState) _ANSI_ARGS_((Tk_Window tkwin, KeySym keySym, XEvent *eventPtr)); /* 137 */ + KeySym (*tkpGetKeySym) _ANSI_ARGS_((TkDisplay *dispPtr, XEvent *eventPtr)); /* 138 */ + void (*tkpInitKeymapInfo) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 139 */ TkRegion (*tkPhotoGetValidRegion) _ANSI_ARGS_((Tk_PhotoHandle handle)); /* 140 */ - TkWindow ** (*tkWmStackorderToplevel) _ANSI_ARGS_((TkWindow * parentPtr)); /* 141 */ - void (*tkFocusFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 142 */ - void (*tkClipCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 143 */ - void (*tkGCCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 144 */ + TkWindow ** (*tkWmStackorderToplevel) _ANSI_ARGS_((TkWindow *parentPtr)); /* 141 */ + void (*tkFocusFree) _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 142 */ + void (*tkClipCleanup) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 143 */ + void (*tkGCCleanup) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 144 */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void *reserved145; + VOID *reserved145; #endif /* UNIX */ #ifdef __WIN32__ void (*tkSubtractRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 145 */ @@ -838,12 +834,12 @@ typedef struct TkIntStubs { #ifdef MAC_OSX_TK void (*tkSubtractRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 145 */ #endif /* MAC_OSX_TK */ - void (*tkStylePkgInit) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 146 */ - void (*tkStylePkgFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 147 */ - Tk_Window (*tkToplevelWindowForCommand) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * cmdName)); /* 148 */ - CONST Tk_OptionSpec * (*tkGetOptionSpec) _ANSI_ARGS_((CONST char * name, Tk_OptionTable optionTable)); /* 149 */ - void *reserved150; - void *reserved151; + void (*tkStylePkgInit) _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 146 */ + void (*tkStylePkgFree) _ANSI_ARGS_((TkMainInfo *mainPtr)); /* 147 */ + Tk_Window (*tkToplevelWindowForCommand) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *cmdName)); /* 148 */ + CONST Tk_OptionSpec * (*tkGetOptionSpec) _ANSI_ARGS_((CONST char *name, Tk_OptionTable optionTable)); /* 149 */ + VOID *reserved150; + VOID *reserved151; void (*tkpDrawFrame) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief)); /* 152 */ } TkIntStubs; -- cgit v0.12 From edf582e29363915f6b8ea7954176768d8545934f Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 6 Apr 2012 22:04:03 +0000 Subject: some more cygwin compatibility improvements --- ChangeLog | 0 doc/canvas.n | 0 generic/default.h | 0 generic/tkColor.c | 0 generic/tkMenu.c | 4 ++-- generic/tkMenu.h | 2 +- tests/color.test | 0 unix/tcl.m4 | 0 unix/tkUnixColor.c | 0 win/tcl.m4 | 20 ++++++++++++-------- win/tkWinDraw.c | 11 ++++++----- win/tkWinInt.h | 4 ++-- xlib/rgb.txt | 0 xlib/xcolors.c | 2 +- 14 files changed, 24 insertions(+), 19 deletions(-) mode change 100644 => 100755 ChangeLog mode change 100644 => 100755 doc/canvas.n mode change 100644 => 100755 generic/default.h mode change 100644 => 100755 generic/tkColor.c mode change 100644 => 100755 generic/tkMenu.c mode change 100644 => 100755 tests/color.test mode change 100644 => 100755 unix/tcl.m4 mode change 100644 => 100755 unix/tkUnixColor.c mode change 100644 => 100755 win/tcl.m4 mode change 100644 => 100755 win/tkWinDraw.c mode change 100644 => 100755 win/tkWinInt.h mode change 100644 => 100755 xlib/rgb.txt mode change 100644 => 100755 xlib/xcolors.c diff --git a/ChangeLog b/ChangeLog old mode 100644 new mode 100755 diff --git a/doc/canvas.n b/doc/canvas.n old mode 100644 new mode 100755 diff --git a/generic/default.h b/generic/default.h old mode 100644 new mode 100755 diff --git a/generic/tkColor.c b/generic/tkColor.c old mode 100644 new mode 100755 diff --git a/generic/tkMenu.c b/generic/tkMenu.c old mode 100644 new mode 100755 index c996df8..19031c5 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -101,7 +101,7 @@ TCL_DECLARE_MUTEX(menuMutex) * to update code in TkpMenuInit that changes the font string entry. */ -char *tkMenuStateStrings[] = {"active", "normal", "disabled", (char *) NULL}; +CONST char *tkMenuStateStrings[] = {"active", "normal", "disabled", (char *) NULL}; static CONST char *menuEntryTypeStrings[] = { "cascade", "checkbutton", "command", "radiobutton", "separator", @@ -113,7 +113,7 @@ static CONST char *menuEntryTypeStrings[] = { * It is used with the "enum compound" declaration in tkMenu.h */ -static char *compoundStrings[] = { +static const char *compoundStrings[] = { "bottom", "center", "left", "none", "right", "top", (char *) NULL }; diff --git a/generic/tkMenu.h b/generic/tkMenu.h index 767e3fc..a428d4c 100644 --- a/generic/tkMenu.h +++ b/generic/tkMenu.h @@ -238,7 +238,7 @@ typedef struct TkMenuEntry { * Menu states */ -EXTERN char *tkMenuStateStrings[]; +EXTERN CONST char *tkMenuStateStrings[]; #define ENTRY_ACTIVE 0 #define ENTRY_NORMAL 1 diff --git a/tests/color.test b/tests/color.test old mode 100644 new mode 100755 diff --git a/unix/tcl.m4 b/unix/tcl.m4 old mode 100644 new mode 100755 diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c old mode 100644 new mode 100755 diff --git a/win/tcl.m4 b/win/tcl.m4 old mode 100644 new mode 100755 index 752f022..ab47afc --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -34,7 +34,11 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist) fi if test ! -f $TCL_BIN_DIR/tclConfig.sh; then - AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?) + if test ! -f $TCL_BIN_DIR/../unix/tclConfig.sh; then + AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?) + fi + TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd` + CFLAGS="$CFLAGS -mwin32" fi AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh) ]) @@ -413,12 +417,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ AC_CACHE_CHECK(for cross-compile version of gcc, ac_cv_cross, AC_TRY_COMPILE([ - #ifdef __WIN32__ + #ifndef __WIN32__ #error cross-compiler #endif ], [], - ac_cv_cross=yes, - ac_cv_cross=no) + ac_cv_cross=no, + ac_cv_cross=yes) ) if test "$ac_cv_cross" = "yes"; then @@ -589,12 +593,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ;; *) AC_TRY_COMPILE([ - #ifdef _WIN64 - #error 64-bit + #ifndef _WIN64 + #error 32-bit #endif ], [], - tcl_win_64bit=no, - tcl_win_64bit=yes + tcl_win_64bit=yes, + tcl_win_64bit=no ) if test "$tcl_win_64bit" = "yes" ; then do64bit=amd64 diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c old mode 100644 new mode 100755 index d0a609f..805dde3 --- a/win/tkWinDraw.c +++ b/win/tkWinDraw.c @@ -24,7 +24,7 @@ * Translation table between X gc functions and Win32 raster op modes. */ -int tkpWinRopModes[] = { +CONST int tkpWinRopModes[] = { R2_BLACK, /* GXclear */ R2_MASKPEN, /* GXand */ R2_MASKPENNOT, /* GXandReverse */ @@ -55,7 +55,7 @@ int tkpWinRopModes[] = { #define SRCORREVERSE (DWORD)0x00DD0228 /* dest = source OR (NOT dest) */ #define SRCNAND (DWORD)0x007700E6 /* dest = NOT (source AND dest) */ -int tkpWinBltModes[] = { +CONST int tkpWinBltModes[] = { BLACKNESS, /* GXclear */ SRCAND, /* GXand */ SRCERASE, /* GXandReverse */ @@ -93,9 +93,10 @@ int tkpWinBltModes[] = { /* * Macros used later in the file. */ - -#define MIN(a,b) ((a>b) ? b : a) -#define MAX(a,b) ((ab) ? b : a) +# define MAX(a,b) ((a Date: Fri, 6 Apr 2012 23:17:17 +0000 Subject: [Bug 3176239] control-MouseWheel causes segv --- ChangeLog | 4 ++++ generic/tkBind.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 generic/tkBind.c diff --git a/ChangeLog b/ChangeLog index 1bdaa06..54ab679 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-04-07 Jan Nijtmans + + * generic/tkBind.c: [Bug 3176239] control-MouseWheel causes segv + 2012-03-29 Jan Nijtmans * unix/tcl.m4: [Bug 3511806] Compiler checks too early diff --git a/generic/tkBind.c b/generic/tkBind.c old mode 100644 new mode 100755 index c3ee5a1..3f05ccc --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -2547,7 +2547,7 @@ ExpandPercents(winPtr, before, eventPtr, keySym, dsPtr) } goto doNumber; case 'A': - if (flags & KEY) { + if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) { Tcl_DStringFree(&buf); string = TkpGetString(winPtr, eventPtr, &buf); } -- cgit v0.12 From 3edf8c2d2a1364716f801d13faa894e4531f7a8a Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 9 Apr 2012 19:20:26 +0000 Subject: make genstubs --- generic/tkIntPlatDecls.h | 392 ++++++------ generic/tkIntXlibDecls.h | 1487 +++++++++++++++++++++++----------------------- generic/tkPlatDecls.h | 72 ++- 3 files changed, 971 insertions(+), 980 deletions(-) diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 2cd4253..9c04bc0 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -32,49 +32,49 @@ #ifdef __WIN32__ /* 0 */ -EXTERN char * TkAlignImageData _ANSI_ARGS_((XImage * image, +EXTERN char * TkAlignImageData _ANSI_ARGS_((XImage *image, int alignment, int bitOrder)); /* Slot 1 is reserved */ /* 2 */ EXTERN void TkGenerateActivateEvents _ANSI_ARGS_(( - TkWindow * winPtr, int active)); + TkWindow *winPtr, int active)); /* 3 */ EXTERN unsigned long TkpGetMS _ANSI_ARGS_((void)); /* 4 */ -EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 5 */ -EXTERN void TkpPrintWindowId _ANSI_ARGS_((char * buf, +EXTERN void TkpPrintWindowId _ANSI_ARGS_((char *buf, Window window)); /* 6 */ -EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * string, Window * idPtr)); +EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *string, Window *idPtr)); /* 7 */ -EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow *winPtr)); /* 8 */ EXTERN void TkpSetCursor _ANSI_ARGS_((TkpCursor cursor)); /* 9 */ -EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, +EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow *winPtr, int state)); /* 10 */ -EXTERN void TkSetPixmapColormap _ANSI_ARGS_((Pixmap pixmap, +EXTERN void TkSetPixmapColormap _ANSI_ARGS_((Pixmap pixmap, Colormap colormap)); /* 11 */ EXTERN void TkWinCancelMouseTimer _ANSI_ARGS_((void)); /* 12 */ -EXTERN void TkWinClipboardRender _ANSI_ARGS_(( - TkDisplay * dispPtr, UINT format)); +EXTERN void TkWinClipboardRender _ANSI_ARGS_((TkDisplay *dispPtr, + UINT format)); /* 13 */ -EXTERN LRESULT TkWinEmbeddedEventProc _ANSI_ARGS_((HWND hwnd, +EXTERN LRESULT TkWinEmbeddedEventProc _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 14 */ -EXTERN void TkWinFillRect _ANSI_ARGS_((HDC dc, int x, int y, +EXTERN void TkWinFillRect _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 15 */ -EXTERN COLORREF TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin, +EXTERN COLORREF TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 16 */ -EXTERN HDC TkWinGetDrawableDC _ANSI_ARGS_((Display * display, - Drawable d, TkWinDCState* state)); +EXTERN HDC TkWinGetDrawableDC _ANSI_ARGS_((Display *display, + Drawable d, TkWinDCState*state)); /* 17 */ EXTERN int TkWinGetModifierState _ANSI_ARGS_((void)); /* 18 */ @@ -82,25 +82,25 @@ EXTERN HPALETTE TkWinGetSystemPalette _ANSI_ARGS_((void)); /* 19 */ EXTERN HWND TkWinGetWrapperWindow _ANSI_ARGS_((Tk_Window tkwin)); /* 20 */ -EXTERN int TkWinHandleMenuEvent _ANSI_ARGS_((HWND * phwnd, - UINT * pMessage, WPARAM * pwParam, - LPARAM * plParam, LRESULT * plResult)); +EXTERN int TkWinHandleMenuEvent _ANSI_ARGS_((HWND *phwnd, + UINT *pMessage, WPARAM *pwParam, + LPARAM *plParam, LRESULT *plResult)); /* 21 */ -EXTERN int TkWinIndexOfColor _ANSI_ARGS_((XColor * colorPtr)); +EXTERN int TkWinIndexOfColor _ANSI_ARGS_((XColor *colorPtr)); /* 22 */ -EXTERN void TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, - HDC hdc, TkWinDCState* state)); +EXTERN void TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, + HDC hdc, TkWinDCState*state)); /* 23 */ -EXTERN LRESULT TkWinResendEvent _ANSI_ARGS_((WNDPROC wndproc, - HWND hwnd, XEvent * eventPtr)); +EXTERN LRESULT TkWinResendEvent _ANSI_ARGS_((WNDPROC wndproc, + HWND hwnd, XEvent *eventPtr)); /* 24 */ -EXTERN HPALETTE TkWinSelectPalette _ANSI_ARGS_((HDC dc, +EXTERN HPALETTE TkWinSelectPalette _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 25 */ -EXTERN void TkWinSetMenu _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void TkWinSetMenu _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 26 */ -EXTERN void TkWinSetWindowPos _ANSI_ARGS_((HWND hwnd, +EXTERN void TkWinSetWindowPos _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); /* 27 */ EXTERN void TkWinWmCleanup _ANSI_ARGS_((HINSTANCE hInstance)); @@ -110,13 +110,13 @@ EXTERN void TkWinXCleanup _ANSI_ARGS_((ClientData clientData)); EXTERN void TkWinXInit _ANSI_ARGS_((HINSTANCE hInstance)); /* 30 */ EXTERN void TkWinSetForegroundWindow _ANSI_ARGS_(( - TkWindow * winPtr)); + TkWindow *winPtr)); /* 31 */ EXTERN void TkWinDialogDebug _ANSI_ARGS_((int debug)); /* 32 */ EXTERN Tcl_Obj * TkWinGetMenuSystemDefault _ANSI_ARGS_(( - Tk_Window tkwin, CONST char * dbName, - CONST char * className)); + Tk_Window tkwin, CONST char *dbName, + CONST char *className)); /* 33 */ EXTERN int TkWinGetPlatformId _ANSI_ARGS_((void)); /* 34 */ @@ -127,20 +127,20 @@ EXTERN int TkWinGetPlatformTheme _ANSI_ARGS_((void)); #ifdef MAC_TCL /* 0 */ EXTERN void TkGenerateActivateEvents _ANSI_ARGS_(( - TkWindow * winPtr, int active)); + TkWindow *winPtr, int active)); /* Slot 1 is reserved */ /* Slot 2 is reserved */ /* 3 */ EXTERN unsigned long TkpGetMS _ANSI_ARGS_((void)); /* Slot 4 is reserved */ /* 5 */ -EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 6 */ -EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow *winPtr)); /* 7 */ EXTERN void TkpSetCursor _ANSI_ARGS_((TkpCursor cursor)); /* 8 */ -EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, +EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow *winPtr, int state)); /* Slot 9 is reserved */ /* 10 */ @@ -148,9 +148,9 @@ EXTERN void TkAboutDlg _ANSI_ARGS_((void)); /* Slot 11 is reserved */ /* Slot 12 is reserved */ /* 13 */ -EXTERN Window TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN Window TkGetTransientMaster _ANSI_ARGS_((TkWindow *winPtr)); /* 14 */ -EXTERN int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, +EXTERN int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* Slot 15 is reserved */ /* 16 */ @@ -162,7 +162,7 @@ EXTERN unsigned int TkMacButtonKeyState _ANSI_ARGS_((void)); EXTERN void TkMacClearMenubarActive _ANSI_ARGS_((void)); /* Slot 20 is reserved */ /* 21 */ -EXTERN int TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID, +EXTERN int TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID, int index)); /* 22 */ EXTERN void TkMacInstallCursor _ANSI_ARGS_((int resizeOverride)); @@ -172,36 +172,36 @@ EXTERN void TkMacHandleTearoffMenu _ANSI_ARGS_((void)); /* Slot 25 is reserved */ /* Slot 26 is reserved */ /* 27 */ -EXTERN void TkMacDoHLEvent _ANSI_ARGS_((EventRecord * theEvent)); +EXTERN void TkMacDoHLEvent _ANSI_ARGS_((EventRecord *theEvent)); /* Slot 28 is reserved */ /* 29 */ EXTERN Time TkMacGenerateTime _ANSI_ARGS_((void)); /* Slot 30 is reserved */ /* 31 */ EXTERN TkWindow * TkMacGetScrollbarGrowWindow _ANSI_ARGS_(( - TkWindow * winPtr)); + TkWindow *winPtr)); /* 32 */ EXTERN Window TkMacGetXWindow _ANSI_ARGS_((WindowRef macWinPtr)); /* 33 */ -EXTERN int TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, +EXTERN int TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 34 */ -EXTERN void TkMacHandleMenuSelect _ANSI_ARGS_((long mResult, +EXTERN void TkMacHandleMenuSelect _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* Slot 35 is reserved */ /* Slot 36 is reserved */ /* Slot 37 is reserved */ /* 38 */ EXTERN void TkMacInvalidateWindow _ANSI_ARGS_(( - MacDrawable * macWin, int flag)); + MacDrawable *macWin, int flag)); /* 39 */ -EXTERN int TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont, +EXTERN int TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 40 */ EXTERN void TkMacMakeRealWindowExist _ANSI_ARGS_(( - TkWindow * winPtr)); + TkWindow *winPtr)); /* 41 */ -EXTERN BitMapPtr TkMacMakeStippleMap _ANSI_ARGS_((Drawable d1, +EXTERN BitMapPtr TkMacMakeStippleMap _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 42 */ EXTERN void TkMacMenuClick _ANSI_ARGS_((void)); @@ -209,52 +209,52 @@ EXTERN void TkMacMenuClick _ANSI_ARGS_((void)); EXTERN void TkMacRegisterOffScreenWindow _ANSI_ARGS_(( Window window, GWorldPtr portPtr)); /* 44 */ -EXTERN int TkMacResizable _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN int TkMacResizable _ANSI_ARGS_((TkWindow *winPtr)); /* Slot 45 is reserved */ /* 46 */ EXTERN void TkMacSetHelpMenuItemCount _ANSI_ARGS_((void)); /* 47 */ -EXTERN void TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow * winPtr, +EXTERN void TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow *winPtr, int flag)); /* 48 */ EXTERN void TkMacSetUpClippingRgn _ANSI_ARGS_((Drawable drawable)); /* 49 */ EXTERN void TkMacSetUpGraphicsPort _ANSI_ARGS_((GC gc)); /* 50 */ -EXTERN void TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow *winPtr)); /* 51 */ EXTERN void TkMacUnregisterMacWindow _ANSI_ARGS_(( GWorldPtr portPtr)); /* 52 */ EXTERN int TkMacUseMenuID _ANSI_ARGS_((short macID)); /* 53 */ -EXTERN RgnHandle TkMacVisableClipRgn _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN RgnHandle TkMacVisableClipRgn _ANSI_ARGS_((TkWindow *winPtr)); /* 54 */ -EXTERN void TkMacWinBounds _ANSI_ARGS_((TkWindow * winPtr, - Rect * geometry)); +EXTERN void TkMacWinBounds _ANSI_ARGS_((TkWindow *winPtr, + Rect *geometry)); /* 55 */ -EXTERN void TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef, - int * xOffset, int * yOffset)); +EXTERN void TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef, + int *xOffset, int *yOffset)); /* Slot 56 is reserved */ /* 57 */ -EXTERN int TkSetMacColor _ANSI_ARGS_((unsigned long pixel, - RGBColor * macColor)); +EXTERN int TkSetMacColor _ANSI_ARGS_((unsigned long pixel, + RGBColor *macColor)); /* 58 */ -EXTERN void TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, +EXTERN void TkSetWMName _ANSI_ARGS_((TkWindow *winPtr, Tk_Uid titleUid)); /* 59 */ EXTERN void TkSuspendClipboard _ANSI_ARGS_((void)); /* Slot 60 is reserved */ /* 61 */ -EXTERN int TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow, +EXTERN int TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 62 */ -EXTERN Tk_Window Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, - int rootX, int rootY, int * newX, int * newY)); +EXTERN Tk_Window Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, + int rootX, int rootY, int *newX, int *newY)); /* 63 */ -EXTERN MacDrawable * TkMacContainerId _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN MacDrawable * TkMacContainerId _ANSI_ARGS_((TkWindow *winPtr)); /* 64 */ -EXTERN MacDrawable * TkMacGetHostToplevel _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN MacDrawable * TkMacGetHostToplevel _ANSI_ARGS_((TkWindow *winPtr)); /* 65 */ EXTERN void TkMacPreprocessMenu _ANSI_ARGS_((void)); /* 66 */ @@ -263,17 +263,17 @@ EXTERN int TkpIsWindowFloating _ANSI_ARGS_((WindowRef window)); #ifdef MAC_OSX_TK /* 0 */ EXTERN void TkGenerateActivateEvents _ANSI_ARGS_(( - TkWindow * winPtr, int active)); + TkWindow *winPtr, int active)); /* Slot 1 is reserved */ /* Slot 2 is reserved */ /* 3 */ -EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow *winPtr)); /* 4 */ -EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow *winPtr)); /* 5 */ EXTERN void TkpSetCursor _ANSI_ARGS_((TkpCursor cursor)); /* 6 */ -EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, +EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow *winPtr, int state)); /* 7 */ EXTERN void TkAboutDlg _ANSI_ARGS_((void)); @@ -282,7 +282,7 @@ EXTERN unsigned int TkMacOSXButtonKeyState _ANSI_ARGS_((void)); /* 9 */ EXTERN void TkMacOSXClearMenubarActive _ANSI_ARGS_((void)); /* 10 */ -EXTERN int TkMacOSXDispatchMenuEvent _ANSI_ARGS_((int menuID, +EXTERN int TkMacOSXDispatchMenuEvent _ANSI_ARGS_((int menuID, int index)); /* 11 */ EXTERN void TkMacOSXInstallCursor _ANSI_ARGS_(( @@ -291,8 +291,7 @@ EXTERN void TkMacOSXInstallCursor _ANSI_ARGS_(( EXTERN void TkMacOSXHandleTearoffMenu _ANSI_ARGS_((void)); /* Slot 13 is reserved */ /* 14 */ -EXTERN int TkMacOSXDoHLEvent _ANSI_ARGS_(( - EventRecord * theEvent)); +EXTERN int TkMacOSXDoHLEvent _ANSI_ARGS_((EventRecord *theEvent)); /* Slot 15 is reserved */ /* 16 */ EXTERN Window TkMacOSXGetXWindow _ANSI_ARGS_((WindowRef macWinPtr)); @@ -300,21 +299,21 @@ EXTERN Window TkMacOSXGetXWindow _ANSI_ARGS_((WindowRef macWinPtr)); EXTERN int TkMacOSXGrowToplevel _ANSI_ARGS_(( WindowRef whichWindow, Point start)); /* 18 */ -EXTERN void TkMacOSXHandleMenuSelect _ANSI_ARGS_((MenuID theMenu, +EXTERN void TkMacOSXHandleMenuSelect _ANSI_ARGS_((MenuID theMenu, MenuItemIndex theItem, int optionKeyPressed)); /* Slot 19 is reserved */ /* Slot 20 is reserved */ /* 21 */ EXTERN void TkMacOSXInvalidateWindow _ANSI_ARGS_(( - MacDrawable * macWin, int flag)); + MacDrawable *macWin, int flag)); /* 22 */ EXTERN int TkMacOSXIsCharacterMissing _ANSI_ARGS_(( Tk_Font tkfont, unsigned int searchChar)); /* 23 */ EXTERN void TkMacOSXMakeRealWindowExist _ANSI_ARGS_(( - TkWindow * winPtr)); + TkWindow *winPtr)); /* 24 */ -EXTERN BitMapPtr TkMacOSXMakeStippleMap _ANSI_ARGS_((Drawable d1, +EXTERN BitMapPtr TkMacOSXMakeStippleMap _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 25 */ EXTERN void TkMacOSXMenuClick _ANSI_ARGS_((void)); @@ -322,39 +321,38 @@ EXTERN void TkMacOSXMenuClick _ANSI_ARGS_((void)); EXTERN void TkMacOSXRegisterOffScreenWindow _ANSI_ARGS_(( Window window, GWorldPtr portPtr)); /* 27 */ -EXTERN int TkMacOSXResizable _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN int TkMacOSXResizable _ANSI_ARGS_((TkWindow *winPtr)); /* 28 */ EXTERN void TkMacOSXSetHelpMenuItemCount _ANSI_ARGS_((void)); /* 29 */ EXTERN void TkMacOSXSetScrollbarGrow _ANSI_ARGS_(( - TkWindow * winPtr, int flag)); + TkWindow *winPtr, int flag)); /* 30 */ EXTERN void TkMacOSXSetUpClippingRgn _ANSI_ARGS_(( Drawable drawable)); /* 31 */ -EXTERN void TkMacOSXSetUpGraphicsPort _ANSI_ARGS_((GC gc, +EXTERN void TkMacOSXSetUpGraphicsPort _ANSI_ARGS_((GC gc, GWorldPtr destPort)); /* 32 */ -EXTERN void TkMacOSXUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkMacOSXUpdateClipRgn _ANSI_ARGS_((TkWindow *winPtr)); /* 33 */ EXTERN void TkMacOSXUnregisterMacWindow _ANSI_ARGS_(( WindowRef portPtr)); /* 34 */ EXTERN int TkMacOSXUseMenuID _ANSI_ARGS_((short macID)); /* 35 */ -EXTERN RgnHandle TkMacOSXVisableClipRgn _ANSI_ARGS_(( - TkWindow * winPtr)); +EXTERN RgnHandle TkMacOSXVisableClipRgn _ANSI_ARGS_((TkWindow *winPtr)); /* 36 */ -EXTERN void TkMacOSXWinBounds _ANSI_ARGS_((TkWindow * winPtr, - Rect * geometry)); +EXTERN void TkMacOSXWinBounds _ANSI_ARGS_((TkWindow *winPtr, + Rect *geometry)); /* 37 */ -EXTERN void TkMacOSXWindowOffset _ANSI_ARGS_((WindowRef wRef, - int * xOffset, int * yOffset)); +EXTERN void TkMacOSXWindowOffset _ANSI_ARGS_((WindowRef wRef, + int *xOffset, int *yOffset)); /* 38 */ -EXTERN int TkSetMacColor _ANSI_ARGS_((unsigned long pixel, - RGBColor * macColor)); +EXTERN int TkSetMacColor _ANSI_ARGS_((unsigned long pixel, + RGBColor *macColor)); /* 39 */ -EXTERN void TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, +EXTERN void TkSetWMName _ANSI_ARGS_((TkWindow *winPtr, Tk_Uid titleUid)); /* 40 */ EXTERN void TkSuspendClipboard _ANSI_ARGS_((void)); @@ -362,13 +360,13 @@ EXTERN void TkSuspendClipboard _ANSI_ARGS_((void)); EXTERN int TkMacOSXZoomToplevel _ANSI_ARGS_(( WindowPtr whichWindow, short zoomPart)); /* 42 */ -EXTERN Tk_Window Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, - int rootX, int rootY, int * newX, int * newY)); +EXTERN Tk_Window Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, + int rootX, int rootY, int *newX, int *newY)); /* 43 */ -EXTERN MacDrawable * TkMacOSXContainerId _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN MacDrawable * TkMacOSXContainerId _ANSI_ARGS_((TkWindow *winPtr)); /* 44 */ EXTERN MacDrawable * TkMacOSXGetHostToplevel _ANSI_ARGS_(( - TkWindow * winPtr)); + TkWindow *winPtr)); /* 45 */ EXTERN void TkMacOSXPreprocessMenu _ANSI_ARGS_((void)); /* 46 */ @@ -377,9 +375,9 @@ EXTERN int TkpIsWindowFloating _ANSI_ARGS_((WindowRef window)); EXTERN Tk_Window TkMacOSXGetCapture _ANSI_ARGS_((void)); /* Slot 48 is reserved */ /* 49 */ -EXTERN Window TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN Window TkGetTransientMaster _ANSI_ARGS_((TkWindow *winPtr)); /* 50 */ -EXTERN int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, +EXTERN int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 51 */ EXTERN void TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin)); @@ -391,33 +389,33 @@ EXTERN unsigned long TkpGetMS _ANSI_ARGS_((void)); /* 0 */ EXTERN void TkCreateXEventSource _ANSI_ARGS_((void)); /* 1 */ -EXTERN void TkFreeWindowId _ANSI_ARGS_((TkDisplay * dispPtr, +EXTERN void TkFreeWindowId _ANSI_ARGS_((TkDisplay *dispPtr, Window w)); /* 2 */ -EXTERN void TkInitXId _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN void TkInitXId _ANSI_ARGS_((TkDisplay *dispPtr)); /* 3 */ -EXTERN int TkpCmapStressed _ANSI_ARGS_((Tk_Window tkwin, +EXTERN int TkpCmapStressed _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 4 */ -EXTERN void TkpSync _ANSI_ARGS_((Display * display)); +EXTERN void TkpSync _ANSI_ARGS_((Display *display)); /* 5 */ -EXTERN Window TkUnixContainerId _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN Window TkUnixContainerId _ANSI_ARGS_((TkWindow *winPtr)); /* 6 */ -EXTERN int TkUnixDoOneXEvent _ANSI_ARGS_((Tcl_Time * timePtr)); +EXTERN int TkUnixDoOneXEvent _ANSI_ARGS_((Tcl_Time *timePtr)); /* 7 */ -EXTERN void TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, +EXTERN void TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, Tk_Window menubar)); /* 8 */ -EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * string, Window * idPtr)); +EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp *interp, + CONST char *string, Window *idPtr)); /* 9 */ -EXTERN void TkWmCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN void TkWmCleanup _ANSI_ARGS_((TkDisplay *dispPtr)); /* 10 */ -EXTERN void TkSendCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN void TkSendCleanup _ANSI_ARGS_((TkDisplay *dispPtr)); /* 11 */ -EXTERN void TkFreeXId _ANSI_ARGS_((TkDisplay * dispPtr)); +EXTERN void TkFreeXId _ANSI_ARGS_((TkDisplay *dispPtr)); /* 12 */ -EXTERN int TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, +EXTERN int TkpWmSetState _ANSI_ARGS_((TkWindow *winPtr, int state)); #endif /* X11 */ @@ -426,182 +424,182 @@ typedef struct TkIntPlatStubs { struct TkIntPlatStubHooks *hooks; #ifdef __WIN32__ - char * (*tkAlignImageData) _ANSI_ARGS_((XImage * image, int alignment, int bitOrder)); /* 0 */ - void *reserved1; - void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 2 */ + char * (*tkAlignImageData) _ANSI_ARGS_((XImage *image, int alignment, int bitOrder)); /* 0 */ + VOID *reserved1; + void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow *winPtr, int active)); /* 2 */ unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */ - void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 4 */ - void (*tkpPrintWindowId) _ANSI_ARGS_((char * buf, Window window)); /* 5 */ - int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string, Window * idPtr)); /* 6 */ - void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 7 */ + void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 4 */ + void (*tkpPrintWindowId) _ANSI_ARGS_((char *buf, Window window)); /* 5 */ + int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string, Window *idPtr)); /* 6 */ + void (*tkpSetCapture) _ANSI_ARGS_((TkWindow *winPtr)); /* 7 */ void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 8 */ - void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 9 */ + void (*tkpWmSetState) _ANSI_ARGS_((TkWindow *winPtr, int state)); /* 9 */ void (*tkSetPixmapColormap) _ANSI_ARGS_((Pixmap pixmap, Colormap colormap)); /* 10 */ void (*tkWinCancelMouseTimer) _ANSI_ARGS_((void)); /* 11 */ - void (*tkWinClipboardRender) _ANSI_ARGS_((TkDisplay * dispPtr, UINT format)); /* 12 */ + void (*tkWinClipboardRender) _ANSI_ARGS_((TkDisplay *dispPtr, UINT format)); /* 12 */ LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 13 */ void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 14 */ COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 15 */ - HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState* state)); /* 16 */ + HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display *display, Drawable d, TkWinDCState*state)); /* 16 */ int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 17 */ HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 18 */ HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 19 */ - int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND * phwnd, UINT * pMessage, WPARAM * pwParam, LPARAM * plParam, LRESULT * plResult)); /* 20 */ - int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 21 */ - void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState* state)); /* 22 */ - LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent * eventPtr)); /* 23 */ + int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND *phwnd, UINT *pMessage, WPARAM *pwParam, LPARAM *plParam, LRESULT *plResult)); /* 20 */ + int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor *colorPtr)); /* 21 */ + void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState*state)); /* 22 */ + LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent *eventPtr)); /* 23 */ HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 24 */ void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 25 */ void (*tkWinSetWindowPos) _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); /* 26 */ void (*tkWinWmCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 27 */ void (*tkWinXCleanup) _ANSI_ARGS_((ClientData clientData)); /* 28 */ void (*tkWinXInit) _ANSI_ARGS_((HINSTANCE hInstance)); /* 29 */ - void (*tkWinSetForegroundWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 30 */ + void (*tkWinSetForegroundWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 30 */ void (*tkWinDialogDebug) _ANSI_ARGS_((int debug)); /* 31 */ - Tcl_Obj * (*tkWinGetMenuSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, CONST char * dbName, CONST char * className)); /* 32 */ + Tcl_Obj * (*tkWinGetMenuSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, CONST char *dbName, CONST char *className)); /* 32 */ int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 33 */ void (*tkWinSetHINSTANCE) _ANSI_ARGS_((HINSTANCE hInstance)); /* 34 */ int (*tkWinGetPlatformTheme) _ANSI_ARGS_((void)); /* 35 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */ - void *reserved1; - void *reserved2; + void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow *winPtr, int active)); /* 0 */ + VOID *reserved1; + VOID *reserved2; unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */ - void *reserved4; - void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */ - void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */ + VOID *reserved4; + void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 5 */ + void (*tkpSetCapture) _ANSI_ARGS_((TkWindow *winPtr)); /* 6 */ void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 7 */ - void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 8 */ - void *reserved9; + void (*tkpWmSetState) _ANSI_ARGS_((TkWindow *winPtr, int state)); /* 8 */ + VOID *reserved9; void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 10 */ - void *reserved11; - void *reserved12; - Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 13 */ + VOID *reserved11; + VOID *reserved12; + Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow *winPtr)); /* 13 */ int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 14 */ - void *reserved15; + VOID *reserved15; void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 16 */ - void *reserved17; + VOID *reserved17; unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 18 */ void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 19 */ - void *reserved20; + VOID *reserved20; int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 21 */ void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 22 */ - void *reserved23; + VOID *reserved23; void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 24 */ - void *reserved25; - void *reserved26; - void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 27 */ - void *reserved28; + VOID *reserved25; + VOID *reserved26; + void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord *theEvent)); /* 27 */ + VOID *reserved28; Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 29 */ - void *reserved30; - TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 31 */ + VOID *reserved30; + TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 31 */ Window (*tkMacGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 32 */ int (*tkMacGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 33 */ void (*tkMacHandleMenuSelect) _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* 34 */ - void *reserved35; - void *reserved36; - void *reserved37; - void (*tkMacInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 38 */ + VOID *reserved35; + VOID *reserved36; + VOID *reserved37; + void (*tkMacInvalidateWindow) _ANSI_ARGS_((MacDrawable *macWin, int flag)); /* 38 */ int (*tkMacIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 39 */ - void (*tkMacMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 40 */ + void (*tkMacMakeRealWindowExist) _ANSI_ARGS_((TkWindow *winPtr)); /* 40 */ BitMapPtr (*tkMacMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 41 */ void (*tkMacMenuClick) _ANSI_ARGS_((void)); /* 42 */ void (*tkMacRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 43 */ - int (*tkMacResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 44 */ - void *reserved45; + int (*tkMacResizable) _ANSI_ARGS_((TkWindow *winPtr)); /* 44 */ + VOID *reserved45; void (*tkMacSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 46 */ - void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 47 */ + void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow *winPtr, int flag)); /* 47 */ void (*tkMacSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 48 */ void (*tkMacSetUpGraphicsPort) _ANSI_ARGS_((GC gc)); /* 49 */ - void (*tkMacUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 50 */ + void (*tkMacUpdateClipRgn) _ANSI_ARGS_((TkWindow *winPtr)); /* 50 */ void (*tkMacUnregisterMacWindow) _ANSI_ARGS_((GWorldPtr portPtr)); /* 51 */ int (*tkMacUseMenuID) _ANSI_ARGS_((short macID)); /* 52 */ - RgnHandle (*tkMacVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 53 */ - void (*tkMacWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 54 */ - void (*tkMacWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 55 */ - void *reserved56; - int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 57 */ - void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 58 */ + RgnHandle (*tkMacVisableClipRgn) _ANSI_ARGS_((TkWindow *winPtr)); /* 53 */ + void (*tkMacWinBounds) _ANSI_ARGS_((TkWindow *winPtr, Rect *geometry)); /* 54 */ + void (*tkMacWindowOffset) _ANSI_ARGS_((WindowRef wRef, int *xOffset, int *yOffset)); /* 55 */ + VOID *reserved56; + int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor *macColor)); /* 57 */ + void (*tkSetWMName) _ANSI_ARGS_((TkWindow *winPtr, Tk_Uid titleUid)); /* 58 */ void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 59 */ - void *reserved60; + VOID *reserved60; int (*tkMacZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 61 */ - Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 62 */ - MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 63 */ - MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 64 */ + Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int *newX, int *newY)); /* 62 */ + MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow *winPtr)); /* 63 */ + MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow *winPtr)); /* 64 */ void (*tkMacPreprocessMenu) _ANSI_ARGS_((void)); /* 65 */ int (*tkpIsWindowFloating) _ANSI_ARGS_((WindowRef window)); /* 66 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */ - void *reserved1; - void *reserved2; - void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 3 */ - void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 4 */ + void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow *winPtr, int active)); /* 0 */ + VOID *reserved1; + VOID *reserved2; + void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 3 */ + void (*tkpSetCapture) _ANSI_ARGS_((TkWindow *winPtr)); /* 4 */ void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 5 */ - void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 6 */ + void (*tkpWmSetState) _ANSI_ARGS_((TkWindow *winPtr, int state)); /* 6 */ void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 7 */ unsigned int (*tkMacOSXButtonKeyState) _ANSI_ARGS_((void)); /* 8 */ void (*tkMacOSXClearMenubarActive) _ANSI_ARGS_((void)); /* 9 */ int (*tkMacOSXDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 10 */ void (*tkMacOSXInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 11 */ void (*tkMacOSXHandleTearoffMenu) _ANSI_ARGS_((void)); /* 12 */ - void *reserved13; - int (*tkMacOSXDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 14 */ - void *reserved15; + VOID *reserved13; + int (*tkMacOSXDoHLEvent) _ANSI_ARGS_((EventRecord *theEvent)); /* 14 */ + VOID *reserved15; Window (*tkMacOSXGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 16 */ int (*tkMacOSXGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 17 */ void (*tkMacOSXHandleMenuSelect) _ANSI_ARGS_((MenuID theMenu, MenuItemIndex theItem, int optionKeyPressed)); /* 18 */ - void *reserved19; - void *reserved20; - void (*tkMacOSXInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 21 */ + VOID *reserved19; + VOID *reserved20; + void (*tkMacOSXInvalidateWindow) _ANSI_ARGS_((MacDrawable *macWin, int flag)); /* 21 */ int (*tkMacOSXIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 22 */ - void (*tkMacOSXMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 23 */ + void (*tkMacOSXMakeRealWindowExist) _ANSI_ARGS_((TkWindow *winPtr)); /* 23 */ BitMapPtr (*tkMacOSXMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 24 */ void (*tkMacOSXMenuClick) _ANSI_ARGS_((void)); /* 25 */ void (*tkMacOSXRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 26 */ - int (*tkMacOSXResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 27 */ + int (*tkMacOSXResizable) _ANSI_ARGS_((TkWindow *winPtr)); /* 27 */ void (*tkMacOSXSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 28 */ - void (*tkMacOSXSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 29 */ + void (*tkMacOSXSetScrollbarGrow) _ANSI_ARGS_((TkWindow *winPtr, int flag)); /* 29 */ void (*tkMacOSXSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 30 */ void (*tkMacOSXSetUpGraphicsPort) _ANSI_ARGS_((GC gc, GWorldPtr destPort)); /* 31 */ - void (*tkMacOSXUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 32 */ + void (*tkMacOSXUpdateClipRgn) _ANSI_ARGS_((TkWindow *winPtr)); /* 32 */ void (*tkMacOSXUnregisterMacWindow) _ANSI_ARGS_((WindowRef portPtr)); /* 33 */ int (*tkMacOSXUseMenuID) _ANSI_ARGS_((short macID)); /* 34 */ - RgnHandle (*tkMacOSXVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 35 */ - void (*tkMacOSXWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 36 */ - void (*tkMacOSXWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 37 */ - int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 38 */ - void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 39 */ + RgnHandle (*tkMacOSXVisableClipRgn) _ANSI_ARGS_((TkWindow *winPtr)); /* 35 */ + void (*tkMacOSXWinBounds) _ANSI_ARGS_((TkWindow *winPtr, Rect *geometry)); /* 36 */ + void (*tkMacOSXWindowOffset) _ANSI_ARGS_((WindowRef wRef, int *xOffset, int *yOffset)); /* 37 */ + int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor *macColor)); /* 38 */ + void (*tkSetWMName) _ANSI_ARGS_((TkWindow *winPtr, Tk_Uid titleUid)); /* 39 */ void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 40 */ int (*tkMacOSXZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, short zoomPart)); /* 41 */ - Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 42 */ - MacDrawable * (*tkMacOSXContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 43 */ - MacDrawable * (*tkMacOSXGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 44 */ + Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int *newX, int *newY)); /* 42 */ + MacDrawable * (*tkMacOSXContainerId) _ANSI_ARGS_((TkWindow *winPtr)); /* 43 */ + MacDrawable * (*tkMacOSXGetHostToplevel) _ANSI_ARGS_((TkWindow *winPtr)); /* 44 */ void (*tkMacOSXPreprocessMenu) _ANSI_ARGS_((void)); /* 45 */ int (*tkpIsWindowFloating) _ANSI_ARGS_((WindowRef window)); /* 46 */ Tk_Window (*tkMacOSXGetCapture) _ANSI_ARGS_((void)); /* 47 */ - void *reserved48; - Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 49 */ + VOID *reserved48; + Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow *winPtr)); /* 49 */ int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 50 */ void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 51 */ - void *reserved52; + VOID *reserved52; unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 53 */ #endif /* MAC_OSX_TK */ #if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */ void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */ - void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay * dispPtr, Window w)); /* 1 */ - void (*tkInitXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 2 */ + void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay *dispPtr, Window w)); /* 1 */ + void (*tkInitXId) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 2 */ int (*tkpCmapStressed) _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 3 */ - void (*tkpSync) _ANSI_ARGS_((Display * display)); /* 4 */ - Window (*tkUnixContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */ - int (*tkUnixDoOneXEvent) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 6 */ + void (*tkpSync) _ANSI_ARGS_((Display *display)); /* 4 */ + Window (*tkUnixContainerId) _ANSI_ARGS_((TkWindow *winPtr)); /* 5 */ + int (*tkUnixDoOneXEvent) _ANSI_ARGS_((Tcl_Time *timePtr)); /* 6 */ void (*tkUnixSetMenubar) _ANSI_ARGS_((Tk_Window tkwin, Tk_Window menubar)); /* 7 */ - int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string, Window * idPtr)); /* 8 */ - void (*tkWmCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 9 */ - void (*tkSendCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 10 */ - void (*tkFreeXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 11 */ - int (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 12 */ + int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *string, Window *idPtr)); /* 8 */ + void (*tkWmCleanup) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 9 */ + void (*tkSendCleanup) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 10 */ + void (*tkFreeXId) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 11 */ + int (*tkpWmSetState) _ANSI_ARGS_((TkWindow *winPtr, int state)); /* 12 */ #endif /* X11 */ } TkIntPlatStubs; diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 05fb35a..3039404 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -38,913 +38,908 @@ #ifdef __WIN32__ /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display* display, GC gc, - int dash_offset, _Xconst char* dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, + int dash_offset, _Xconst char*dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display* d)); +EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display* d, Visual* v, - unsigned int ui1, int i1, int i2, char* cp, - unsigned int ui2, unsigned int ui3, int i3, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, + unsigned int ui1, int i1, int i2, char*cp, + unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display* d, Drawable dr, - int i1, int i2, unsigned int ui1, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, + int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display* d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display* d, Window w, - Visual* v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, + Visual*v, int i)); /* 7 */ -EXTERN Cursor XCreatePixmapCursor _ANSI_ARGS_((Display* d, - Pixmap p1, Pixmap p2, XColor* x1, XColor* x2, +EXTERN Cursor XCreatePixmapCursor _ANSI_ARGS_((Display*d, + Pixmap p1, Pixmap p2, XColor*x1, XColor*x2, unsigned int ui1, unsigned int ui2)); /* 8 */ -EXTERN Cursor XCreateGlyphCursor _ANSI_ARGS_((Display* d, Font f1, - Font f2, unsigned int ui1, unsigned int ui2, - XColor* x1, XColor* x2)); +EXTERN Cursor XCreateGlyphCursor _ANSI_ARGS_((Display*d, Font f1, + Font f2, unsigned int ui1, unsigned int ui2, + XColor*x1, XColor*x2)); /* 9 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 10 */ -EXTERN XHostAddress * XListHosts _ANSI_ARGS_((Display* d, int* i, Bool* b)); +EXTERN XHostAddress * XListHosts _ANSI_ARGS_((Display*d, int*i, Bool*b)); /* 11 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display* d, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, unsigned int k, int i)); /* 12 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char* c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); /* 13 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display* d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); /* 14 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 15 */ -EXTERN Status XIconifyWindow _ANSI_ARGS_((Display* d, Window w, +EXTERN Status XIconifyWindow _ANSI_ARGS_((Display*d, Window w, int i)); /* 16 */ -EXTERN Status XWithdrawWindow _ANSI_ARGS_((Display* d, Window w, +EXTERN Status XWithdrawWindow _ANSI_ARGS_((Display*d, Window w, int i)); /* 17 */ -EXTERN Status XGetWMColormapWindows _ANSI_ARGS_((Display* d, - Window w, Window** wpp, int* ip)); +EXTERN Status XGetWMColormapWindows _ANSI_ARGS_((Display*d, + Window w, Window**wpp, int*ip)); /* 18 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display* d, Colormap c, - XColor* xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, + XColor*xp)); /* 19 */ -EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); /* 20 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display* d, Window w, - Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char* c, int i3)); +EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, + Atom a1, Atom a2, int i1, int i2, + _Xconst unsigned char*c, int i3)); /* 21 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display* d, - Window w, unsigned long ul, - XSetWindowAttributes* x)); +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, + Window w, unsigned long ul, + XSetWindowAttributes*x)); /* 22 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); /* 23 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display* d, Window w, - unsigned int i, XWindowChanges* x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, + unsigned int i, XWindowChanges*x)); /* 24 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, - Drawable dr2, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2, int i3, +EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, + Drawable dr2, GC g, int i1, int i2, + unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1, - Drawable dr2, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2, int i3, +EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, + Drawable dr2, GC g, int i1, int i2, + unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 26 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display* display, - Drawable d, _Xconst char* data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, + Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 27 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display* d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 28 */ -EXTERN void XDeleteProperty _ANSI_ARGS_((Display* d, Window w, +EXTERN void XDeleteProperty _ANSI_ARGS_((Display*d, Window w, Atom a)); /* 29 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); /* 30 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, - int i1, int i2, unsigned int ui1, +EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, + int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 31 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XPoint* x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, + XPoint*x, int i1, int i2)); /* 32 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr, - GC g, int i1, int i2, unsigned int ui1, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, + GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 33 */ -EXTERN void XFillArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, - int i1, int i2, unsigned int ui1, +EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, + int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 34 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XPoint* x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, + GC g, XPoint*x, int i1, int i2, int i3)); /* 35 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XRectangle* x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, + GC g, XRectangle*x, int i)); /* 36 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* d, int i)); +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*d, int i)); /* 37 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); /* 38 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display* d, Colormap c, - unsigned long* ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, + unsigned long*ulp, int i, unsigned long ul)); /* 39 */ -EXTERN void XFreeCursor _ANSI_ARGS_((Display* d, Cursor c)); +EXTERN void XFreeCursor _ANSI_ARGS_((Display*d, Cursor c)); /* 40 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); /* 41 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display* d, Drawable dr, - Window* w, int* i1, int* i2, - unsigned int* ui1, unsigned int* ui2, - unsigned int* ui3, unsigned int* ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, + Window*w, int*i1, int*i2, unsigned int*ui1, + unsigned int*ui2, unsigned int*ui3, + unsigned int*ui4)); /* 42 */ -EXTERN void XGetInputFocus _ANSI_ARGS_((Display* d, Window* w, - int* i)); +EXTERN void XGetInputFocus _ANSI_ARGS_((Display*d, Window*w, + int*i)); /* 43 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display* d, Window w, - Atom a1, long l1, long l2, Bool b, Atom a2, - Atom* ap, int* ip, unsigned long* ulp1, - unsigned long* ulp2, unsigned char** cpp)); +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, + Atom a1, long l1, long l2, Bool b, Atom a2, + Atom*ap, int*ip, unsigned long*ulp1, + unsigned long*ulp2, unsigned char**cpp)); /* 44 */ -EXTERN Status XGetWindowAttributes _ANSI_ARGS_((Display* d, - Window w, XWindowAttributes* x)); +EXTERN Status XGetWindowAttributes _ANSI_ARGS_((Display*d, + Window w, XWindowAttributes*x)); /* 45 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 46 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display* d, Window w1, - Bool b, unsigned int ui, int i1, int i2, +EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, + Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 47 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); /* 48 */ -EXTERN Status XLookupColor _ANSI_ARGS_((Display* d, Colormap c1, - _Xconst char* c2, XColor* x1, XColor* x2)); +EXTERN Status XLookupColor _ANSI_ARGS_((Display*d, Colormap c1, + _Xconst char*c2, XColor*x1, XColor*x2)); /* 49 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); /* 50 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, - int i1, int i2, unsigned int ui1, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, + int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 51 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display* d, Window w, - int i1, int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, + int i2)); /* 52 */ -EXTERN void XNextEvent _ANSI_ARGS_((Display* d, XEvent* x)); +EXTERN void XNextEvent _ANSI_ARGS_((Display*d, XEvent*x)); /* 53 */ -EXTERN void XPutBackEvent _ANSI_ARGS_((Display* d, XEvent* x)); +EXTERN void XPutBackEvent _ANSI_ARGS_((Display*d, XEvent*x)); /* 54 */ -EXTERN void XQueryColors _ANSI_ARGS_((Display* d, Colormap c, - XColor* x, int i)); +EXTERN void XQueryColors _ANSI_ARGS_((Display*d, Colormap c, + XColor*x, int i)); /* 55 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display* d, Window w1, - Window* w2, Window* w3, int* i1, int* i2, - int* i3, int* i4, unsigned int* ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, + Window*w2, Window*w3, int*i1, int*i2, int*i3, + int*i4, unsigned int*ui)); /* 56 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display* d, Window w1, - Window* w2, Window* w3, Window** w4, - unsigned int* ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, + Window*w2, Window*w3, Window**w4, + unsigned int*ui)); /* 57 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); /* 58 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( - XMappingEvent* x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); /* 59 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display* d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 60 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, long l)); /* 61 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, - long l, XEvent* x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, + long l, XEvent*x)); /* 62 */ -EXTERN void XSetCommand _ANSI_ARGS_((Display* d, Window w, - CONST char** c, int i)); +EXTERN void XSetCommand _ANSI_ARGS_((Display*d, Window w, + CONST char**c, int i)); /* 63 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display* d, Window w, - _Xconst char* c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, + _Xconst char*c)); /* 64 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 65 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 66 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 67 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 68 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 69 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 70 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 71 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 72 */ -EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display* d, - Window w1, Window w2, int i1, int i2, - int* i3, int* i4, Window* w3)); +EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display*d, + Window w1, Window w2, int i1, int i2, int*i3, + int*i4, Window*w3)); /* 73 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); /* 74 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); /* 75 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); /* 76 */ -EXTERN void XWindowEvent _ANSI_ARGS_((Display* d, Window w, - long l, XEvent* x)); +EXTERN void XWindowEvent _ANSI_ARGS_((Display*d, Window w, + long l, XEvent*x)); /* 77 */ EXTERN void XDestroyIC _ANSI_ARGS_((XIC x)); /* 78 */ -EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent* x, Window w)); +EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent*x, Window w)); /* 79 */ -EXTERN int XmbLookupString _ANSI_ARGS_((XIC xi, - XKeyPressedEvent* xk, char* c, int i, - KeySym* k, Status* s)); +EXTERN int XmbLookupString _ANSI_ARGS_((XIC xi, + XKeyPressedEvent*xk, char*c, int i, KeySym*k, + Status*s)); /* 80 */ -EXTERN void TkPutImage _ANSI_ARGS_((unsigned long * colors, - int ncolors, Display* display, Drawable d, - GC gc, XImage* image, int src_x, int src_y, - int dest_x, int dest_y, unsigned int width, +EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, + int ncolors, Display*display, Drawable d, + GC gc, XImage*image, int src_x, int src_y, + int dest_x, int dest_y, unsigned int width, unsigned int height)); /* Slot 81 is reserved */ /* 82 */ -EXTERN Status XParseColor _ANSI_ARGS_((Display * display, - Colormap map, _Xconst char* spec, - XColor * colorPtr)); +EXTERN Status XParseColor _ANSI_ARGS_((Display *display, + Colormap map, _Xconst char*spec, + XColor *colorPtr)); /* 83 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display* display, Drawable d, - unsigned long valuemask, XGCValues* values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, + unsigned long valuemask, XGCValues*values)); /* 84 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display* display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); /* 85 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display* display, - _Xconst char* atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, + _Xconst char*atom_name, Bool only_if_exists)); /* 86 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 87 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 88 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 89 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 90 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 91 */ -EXTERN void XChangeGC _ANSI_ARGS_((Display * d, GC gc, - unsigned long mask, XGCValues * values)); +EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, + unsigned long mask, XGCValues *values)); /* 92 */ -EXTERN void XSetFont _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFont _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 93 */ -EXTERN void XSetArcMode _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetArcMode _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 94 */ -EXTERN void XSetStipple _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetStipple _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 95 */ -EXTERN void XSetFillRule _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFillRule _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 96 */ -EXTERN void XSetFillStyle _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFillStyle _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 97 */ -EXTERN void XSetFunction _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFunction _ANSI_ARGS_((Display *display, GC gc, int function)); /* 98 */ -EXTERN void XSetLineAttributes _ANSI_ARGS_((Display * display, - GC gc, unsigned int line_width, - int line_style, int cap_style, +EXTERN void XSetLineAttributes _ANSI_ARGS_((Display *display, + GC gc, unsigned int line_width, + int line_style, int cap_style, int join_style)); /* 99 */ -EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage * image)); +EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 100 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 101 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display* display, - long vinfo_mask, XVisualInfo* vinfo_template, - int* nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, + long vinfo_mask, XVisualInfo*vinfo_template, + int*nitems_return)); /* 102 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display* display, - Window w, XTextProperty* text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, + Window w, XTextProperty*text_prop)); /* 103 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char** list, - int count, XTextProperty* text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, + int count, XTextProperty*text_prop_return)); /* 104 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 105 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display* d, Window s, - Window dw, int sx, int sy, unsigned int sw, +EXTERN void XWarpPointer _ANSI_ARGS_((Display*d, Window s, + Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 106 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display* display, - Drawable d, GC gc, int x, int y, +EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, + Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display* display, GC gc, - int dash_offset, _Xconst char* dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, + int dash_offset, _Xconst char*dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display* d)); +EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display* d, Visual* v, - unsigned int ui1, int i1, int i2, char* cp, - unsigned int ui2, unsigned int ui3, int i3, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, + unsigned int ui1, int i1, int i2, char*cp, + unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display* d, Drawable dr, - int i1, int i2, unsigned int ui1, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, + int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display* d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display* d, Window w, - Visual* v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, + Visual*v, int i)); /* 7 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 8 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display* d, KeyCode k, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, KeyCode k, int i)); /* 9 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char* c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); /* 10 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display* d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); /* 11 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 12 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display* d, Colormap c, - XColor* xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, + XColor*xp)); /* 13 */ -EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); /* 14 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display* d, Window w, - Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char* c, int i3)); +EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, + Atom a1, Atom a2, int i1, int i2, + _Xconst unsigned char*c, int i3)); /* 15 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display* d, - Window w, unsigned long ul, - XSetWindowAttributes* x)); +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, + Window w, unsigned long ul, + XSetWindowAttributes*x)); /* 16 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display* d, Window w, - unsigned int i, XWindowChanges* x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, + unsigned int i, XWindowChanges*x)); /* 17 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, - Drawable dr2, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2, int i3, +EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, + Drawable dr2, GC g, int i1, int i2, + unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 18 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1, - Drawable dr2, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2, int i3, +EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, + Drawable dr2, GC g, int i1, int i2, + unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 19 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display* display, - Drawable d, _Xconst char* data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, + Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 20 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display* d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 21 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); /* 22 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, - int i1, int i2, unsigned int ui1, +EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, + int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XPoint* x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, + XPoint*x, int i1, int i2)); /* 24 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr, - GC g, int i1, int i2, unsigned int ui1, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, + GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 25 */ -EXTERN void XFillArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, - int i1, int i2, unsigned int ui1, +EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, + int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 26 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XPoint* x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, + GC g, XPoint*x, int i1, int i2, int i3)); /* 27 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XRectangle* x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, + GC g, XRectangle*x, int i)); /* 28 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); /* 29 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display* d, Colormap c, - unsigned long* ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, + unsigned long*ulp, int i, unsigned long ul)); /* 30 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); /* 31 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display* d, Drawable dr, - Window* w, int* i1, int* i2, - unsigned int* ui1, unsigned int* ui2, - unsigned int* ui3, unsigned int* ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, + Window*w, int*i1, int*i2, unsigned int*ui1, + unsigned int*ui2, unsigned int*ui3, + unsigned int*ui4)); /* 32 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display* d, Window w, - Atom a1, long l1, long l2, Bool b, Atom a2, - Atom* ap, int* ip, unsigned long* ulp1, - unsigned long* ulp2, unsigned char** cpp)); +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, + Atom a1, long l1, long l2, Bool b, Atom a2, + Atom*ap, int*ip, unsigned long*ulp1, + unsigned long*ulp2, unsigned char**cpp)); /* 33 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 34 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display* d, Window w1, - Bool b, unsigned int ui, int i1, int i2, +EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, + Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 35 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); /* 36 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); /* 37 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, - int i1, int i2, unsigned int ui1, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, + int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 38 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display* d, Window w, - int i1, int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, + int i2)); /* 39 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display* d, Window w1, - Window* w2, Window* w3, int* i1, int* i2, - int* i3, int* i4, unsigned int* ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, + Window*w2, Window*w3, int*i1, int*i2, int*i3, + int*i4, unsigned int*ui)); /* 40 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); /* 41 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( - XMappingEvent* x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); /* 42 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display* d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 43 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, long l)); /* 44 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, - long l, XEvent* x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, + long l, XEvent*x)); /* 45 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display* d, Window w, - _Xconst char* c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, + _Xconst char*c)); /* 46 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 47 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 48 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 49 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 50 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 51 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 52 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 53 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 54 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); /* 55 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); /* 56 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); /* 57 */ -EXTERN void TkPutImage _ANSI_ARGS_((unsigned long * colors, - int ncolors, Display* display, Drawable d, - GC gc, XImage* image, int src_x, int src_y, - int dest_x, int dest_y, unsigned int width, +EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, + int ncolors, Display*display, Drawable d, + GC gc, XImage*image, int src_x, int src_y, + int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 58 */ -EXTERN Status XParseColor _ANSI_ARGS_((Display * display, - Colormap map, _Xconst char* spec, - XColor * colorPtr)); +EXTERN Status XParseColor _ANSI_ARGS_((Display *display, + Colormap map, _Xconst char*spec, + XColor *colorPtr)); /* 59 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display* display, Drawable d, - unsigned long valuemask, XGCValues* values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, + unsigned long valuemask, XGCValues*values)); /* 60 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display* display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); /* 61 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display* display, - _Xconst char* atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, + _Xconst char*atom_name, Bool only_if_exists)); /* 62 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 63 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 64 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 65 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 66 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 67 */ -EXTERN void XChangeGC _ANSI_ARGS_((Display * d, GC gc, - unsigned long mask, XGCValues * values)); +EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, + unsigned long mask, XGCValues *values)); /* 68 */ -EXTERN void XSetFont _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFont _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 69 */ -EXTERN void XSetArcMode _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetArcMode _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 70 */ -EXTERN void XSetStipple _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetStipple _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 71 */ -EXTERN void XSetFillRule _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFillRule _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 72 */ -EXTERN void XSetFillStyle _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFillStyle _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 73 */ -EXTERN void XSetFunction _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFunction _ANSI_ARGS_((Display *display, GC gc, int function)); /* 74 */ -EXTERN void XSetLineAttributes _ANSI_ARGS_((Display * display, - GC gc, unsigned int line_width, - int line_style, int cap_style, +EXTERN void XSetLineAttributes _ANSI_ARGS_((Display *display, + GC gc, unsigned int line_width, + int line_style, int cap_style, int join_style)); /* 75 */ -EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage * image)); +EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 76 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 77 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display* display, - long vinfo_mask, XVisualInfo* vinfo_template, - int* nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, + long vinfo_mask, XVisualInfo*vinfo_template, + int*nitems_return)); /* 78 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display* display, - Window w, XTextProperty* text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, + Window w, XTextProperty*text_prop)); /* 79 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char** list, - int count, XTextProperty* text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, + int count, XTextProperty*text_prop_return)); /* 80 */ -EXTERN void XDrawSegments _ANSI_ARGS_((Display * display, - Drawable d, GC gc, XSegment * segments, +EXTERN void XDrawSegments _ANSI_ARGS_((Display *display, + Drawable d, GC gc, XSegment *segments, int nsegments)); /* 81 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* display, +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*display, int mode)); /* 82 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 83 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display* display, - Drawable d, GC gc, int x, int y, +EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, + Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 84 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); /* 85 */ -EXTERN void XDrawPoint _ANSI_ARGS_((Display* display, Drawable d, +EXTERN void XDrawPoint _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y)); /* 86 */ -EXTERN void XDrawPoints _ANSI_ARGS_((Display* display, - Drawable d, GC gc, XPoint * points, - int npoints, int mode)); +EXTERN void XDrawPoints _ANSI_ARGS_((Display*display, Drawable d, + GC gc, XPoint *points, int npoints, int mode)); /* 87 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display* display, - Window src_w, Window dest_w, int src_x, - int src_y, unsigned int src_width, - unsigned int src_height, int dest_x, +EXTERN void XWarpPointer _ANSI_ARGS_((Display*display, + Window src_w, Window dest_w, int src_x, + int src_y, unsigned int src_width, + unsigned int src_height, int dest_x, int dest_y)); /* 88 */ -EXTERN void XQueryColor _ANSI_ARGS_((Display * display, - Colormap colormap, XColor * def_in_out)); +EXTERN void XQueryColor _ANSI_ARGS_((Display *display, + Colormap colormap, XColor *def_in_out)); /* 89 */ -EXTERN void XQueryColors _ANSI_ARGS_((Display * display, - Colormap colormap, XColor * defs_in_out, +EXTERN void XQueryColors _ANSI_ARGS_((Display *display, + Colormap colormap, XColor *defs_in_out, int ncolors)); /* 90 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display* d, Window w1, - Window* w2, Window* w3, Window** w4, - unsigned int* ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, + Window*w2, Window*w3, Window**w4, + unsigned int*ui)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display* display, GC gc, - int dash_offset, _Xconst char* dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, + int dash_offset, _Xconst char*dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display* d)); +EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display* d, Visual* v, - unsigned int ui1, int i1, int i2, char* cp, - unsigned int ui2, unsigned int ui3, int i3, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, + unsigned int ui1, int i1, int i2, char*cp, + unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display* d, Drawable dr, - int i1, int i2, unsigned int ui1, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, + int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display* d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display* d, Window w, - Visual* v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, + Visual*v, int i)); /* 7 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 8 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display* d, KeyCode k, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, KeyCode k, int i)); /* 9 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char* c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); /* 10 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display* d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); /* 11 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 12 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display* d, Colormap c, - XColor* xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, + XColor*xp)); /* 13 */ -EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); /* 14 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display* d, Window w, - Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char* c, int i3)); +EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, + Atom a1, Atom a2, int i1, int i2, + _Xconst unsigned char*c, int i3)); /* 15 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display* d, - Window w, unsigned long ul, - XSetWindowAttributes* x)); +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, + Window w, unsigned long ul, + XSetWindowAttributes*x)); /* 16 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display* d, Window w, - unsigned int i, XWindowChanges* x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, + unsigned int i, XWindowChanges*x)); /* 17 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, - Drawable dr2, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2, int i3, +EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, + Drawable dr2, GC g, int i1, int i2, + unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 18 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1, - Drawable dr2, GC g, int i1, int i2, - unsigned int ui1, unsigned int ui2, int i3, +EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, + Drawable dr2, GC g, int i1, int i2, + unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 19 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display* display, - Drawable d, _Xconst char* data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, + Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 20 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display* d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 21 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); /* 22 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, - int i1, int i2, unsigned int ui1, +EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, + int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XPoint* x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, + XPoint*x, int i1, int i2)); /* 24 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr, - GC g, int i1, int i2, unsigned int ui1, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, + GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 25 */ -EXTERN void XFillArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, - int i1, int i2, unsigned int ui1, +EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, + int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 26 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XPoint* x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, + GC g, XPoint*x, int i1, int i2, int i3)); /* 27 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr, - GC g, XRectangle* x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, + GC g, XRectangle*x, int i)); /* 28 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); /* 29 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display* d, Colormap c, - unsigned long* ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, + unsigned long*ulp, int i, unsigned long ul)); /* 30 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); /* 31 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display* d, Drawable dr, - Window* w, int* i1, int* i2, - unsigned int* ui1, unsigned int* ui2, - unsigned int* ui3, unsigned int* ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, + Window*w, int*i1, int*i2, unsigned int*ui1, + unsigned int*ui2, unsigned int*ui3, + unsigned int*ui4)); /* 32 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display* d, Window w, - Atom a1, long l1, long l2, Bool b, Atom a2, - Atom* ap, int* ip, unsigned long* ulp1, - unsigned long* ulp2, unsigned char** cpp)); +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, + Atom a1, long l1, long l2, Bool b, Atom a2, + Atom*ap, int*ip, unsigned long*ulp1, + unsigned long*ulp2, unsigned char**cpp)); /* 33 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 34 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display* d, Window w1, - Bool b, unsigned int ui, int i1, int i2, +EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, + Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 35 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); /* 36 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); /* 37 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, - int i1, int i2, unsigned int ui1, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, + int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 38 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display* d, Window w, - int i1, int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, + int i2)); /* 39 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display* d, Window w1, - Window* w2, Window* w3, int* i1, int* i2, - int* i3, int* i4, unsigned int* ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, + Window*w2, Window*w3, int*i1, int*i2, int*i3, + int*i4, unsigned int*ui)); /* 40 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); /* 41 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( - XMappingEvent* x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); /* 42 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display* d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 43 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, long l)); /* 44 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, - long l, XEvent* x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, + long l, XEvent*x)); /* 45 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display* d, Window w, - _Xconst char* c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, + _Xconst char*c)); /* 46 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 47 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 48 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 49 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 50 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 51 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 52 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display* d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 53 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 54 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); /* 55 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); /* 56 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); /* 57 */ -EXTERN void TkPutImage _ANSI_ARGS_((unsigned long * colors, - int ncolors, Display* display, Drawable d, - GC gc, XImage* image, int src_x, int src_y, - int dest_x, int dest_y, unsigned int width, +EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, + int ncolors, Display*display, Drawable d, + GC gc, XImage*image, int src_x, int src_y, + int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 58 */ -EXTERN Status XParseColor _ANSI_ARGS_((Display * display, - Colormap map, _Xconst char* spec, - XColor * colorPtr)); +EXTERN Status XParseColor _ANSI_ARGS_((Display *display, + Colormap map, _Xconst char*spec, + XColor *colorPtr)); /* 59 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display* display, Drawable d, - unsigned long valuemask, XGCValues* values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, + unsigned long valuemask, XGCValues*values)); /* 60 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display* display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); /* 61 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display* display, - _Xconst char* atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, + _Xconst char*atom_name, Bool only_if_exists)); /* 62 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 63 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 64 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 65 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 66 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display* display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 67 */ -EXTERN void XChangeGC _ANSI_ARGS_((Display * d, GC gc, - unsigned long mask, XGCValues * values)); +EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, + unsigned long mask, XGCValues *values)); /* 68 */ -EXTERN void XSetFont _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFont _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 69 */ -EXTERN void XSetArcMode _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetArcMode _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 70 */ -EXTERN void XSetStipple _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetStipple _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 71 */ -EXTERN void XSetFillRule _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFillRule _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 72 */ -EXTERN void XSetFillStyle _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFillStyle _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 73 */ -EXTERN void XSetFunction _ANSI_ARGS_((Display * display, GC gc, +EXTERN void XSetFunction _ANSI_ARGS_((Display *display, GC gc, int function)); /* 74 */ -EXTERN void XSetLineAttributes _ANSI_ARGS_((Display * display, - GC gc, unsigned int line_width, - int line_style, int cap_style, +EXTERN void XSetLineAttributes _ANSI_ARGS_((Display *display, + GC gc, unsigned int line_width, + int line_style, int cap_style, int join_style)); /* 75 */ -EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage * image)); +EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 76 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 77 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display* display, - long vinfo_mask, XVisualInfo* vinfo_template, - int* nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, + long vinfo_mask, XVisualInfo*vinfo_template, + int*nitems_return)); /* 78 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display* display, - Window w, XTextProperty* text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, + Window w, XTextProperty*text_prop)); /* 79 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char** list, - int count, XTextProperty* text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, + int count, XTextProperty*text_prop_return)); /* 80 */ -EXTERN void XDrawSegments _ANSI_ARGS_((Display * display, - Drawable d, GC gc, XSegment * segments, +EXTERN void XDrawSegments _ANSI_ARGS_((Display *display, + Drawable d, GC gc, XSegment *segments, int nsegments)); /* 81 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* display, +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*display, int mode)); /* 82 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 83 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display* display, - Drawable d, GC gc, int x, int y, +EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, + Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 84 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); /* 85 */ -EXTERN void XDrawPoint _ANSI_ARGS_((Display* display, Drawable d, +EXTERN void XDrawPoint _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y)); /* 86 */ -EXTERN void XDrawPoints _ANSI_ARGS_((Display* display, - Drawable d, GC gc, XPoint * points, - int npoints, int mode)); +EXTERN void XDrawPoints _ANSI_ARGS_((Display*display, Drawable d, + GC gc, XPoint *points, int npoints, int mode)); /* 87 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display* display, - Window src_w, Window dest_w, int src_x, - int src_y, unsigned int src_width, - unsigned int src_height, int dest_x, +EXTERN void XWarpPointer _ANSI_ARGS_((Display*display, + Window src_w, Window dest_w, int src_x, + int src_y, unsigned int src_width, + unsigned int src_height, int dest_x, int dest_y)); /* 88 */ -EXTERN void XQueryColor _ANSI_ARGS_((Display * display, - Colormap colormap, XColor * def_in_out)); +EXTERN void XQueryColor _ANSI_ARGS_((Display *display, + Colormap colormap, XColor *def_in_out)); /* 89 */ -EXTERN void XQueryColors _ANSI_ARGS_((Display * display, - Colormap colormap, XColor * defs_in_out, +EXTERN void XQueryColors _ANSI_ARGS_((Display *display, + Colormap colormap, XColor *defs_in_out, int ncolors)); /* 90 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display* d, Window w1, - Window* w2, Window* w3, Window** w4, - unsigned int* ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, + Window*w2, Window*w3, Window**w4, + unsigned int*ui)); /* 91 */ -EXTERN int XSync _ANSI_ARGS_((Display * display, Bool flag)); +EXTERN int XSync _ANSI_ARGS_((Display *display, Bool flag)); #endif /* MAC_OSX_TK */ typedef struct TkIntXlibStubs { @@ -952,300 +947,300 @@ typedef struct TkIntXlibStubs { struct TkIntXlibStubHooks *hooks; #ifdef __WIN32__ - void (*xSetDashes) _ANSI_ARGS_((Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ + XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 6 */ - Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display* d, Pixmap p1, Pixmap p2, XColor* x1, XColor* x2, unsigned int ui1, unsigned int ui2)); /* 7 */ - Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display* d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2)); /* 8 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ + Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display*d, Pixmap p1, Pixmap p2, XColor*x1, XColor*x2, unsigned int ui1, unsigned int ui2)); /* 7 */ + Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display*d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor*x1, XColor*x2)); /* 8 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 9 */ - XHostAddress * (*xListHosts) _ANSI_ARGS_((Display* d, int* i, Bool* b)); /* 10 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, unsigned int k, int i)); /* 11 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 12 */ - Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 13 */ + XHostAddress * (*xListHosts) _ANSI_ARGS_((Display*d, int*i, Bool*b)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, unsigned int k, int i)); /* 11 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 12 */ + Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 13 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 14 */ - Status (*xIconifyWindow) _ANSI_ARGS_((Display* d, Window w, int i)); /* 15 */ - Status (*xWithdrawWindow) _ANSI_ARGS_((Display* d, Window w, int i)); /* 16 */ - Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display* d, Window w, Window** wpp, int* ip)); /* 17 */ - Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 18 */ - void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 19 */ - void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 20 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 21 */ - void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 22 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 23 */ - void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */ - void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 26 */ - void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 27 */ - void (*xDeleteProperty) _ANSI_ARGS_((Display* d, Window w, Atom a)); /* 28 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 29 */ - void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */ - void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 31 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */ - void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */ - void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 34 */ - void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 35 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display* d, int i)); /* 36 */ - void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 37 */ - void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 38 */ - void (*xFreeCursor) _ANSI_ARGS_((Display* d, Cursor c)); /* 39 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 40 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 41 */ - void (*xGetInputFocus) _ANSI_ARGS_((Display* d, Window* w, int* i)); /* 42 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 43 */ - Status (*xGetWindowAttributes) _ANSI_ARGS_((Display* d, Window w, XWindowAttributes* x)); /* 44 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */ - int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 47 */ - Status (*xLookupColor) _ANSI_ARGS_((Display* d, Colormap c1, _Xconst char* c2, XColor* x1, XColor* x2)); /* 48 */ - void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 49 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */ - void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 51 */ - void (*xNextEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 52 */ - void (*xPutBackEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 53 */ - void (*xQueryColors) _ANSI_ARGS_((Display* d, Colormap c, XColor* x, int i)); /* 54 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 55 */ - Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 56 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 57 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 58 */ - void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */ - void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 60 */ - Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 61 */ - void (*xSetCommand) _ANSI_ARGS_((Display* d, Window w, CONST char** c, int i)); /* 62 */ - void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 63 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 64 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 65 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 66 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 67 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 68 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 69 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 70 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 71 */ - Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display* d, Window w1, Window w2, int i1, int i2, int* i3, int* i4, Window* w3)); /* 72 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 73 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 74 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 75 */ - void (*xWindowEvent) _ANSI_ARGS_((Display* d, Window w, long l, XEvent* x)); /* 76 */ + Status (*xIconifyWindow) _ANSI_ARGS_((Display*d, Window w, int i)); /* 15 */ + Status (*xWithdrawWindow) _ANSI_ARGS_((Display*d, Window w, int i)); /* 16 */ + Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display*d, Window w, Window**wpp, int*ip)); /* 17 */ + Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 18 */ + void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 19 */ + void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 20 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 21 */ + void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 22 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 23 */ + void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */ + void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 26 */ + void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 27 */ + void (*xDeleteProperty) _ANSI_ARGS_((Display*d, Window w, Atom a)); /* 28 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 29 */ + void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */ + void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 31 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */ + void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */ + void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 34 */ + void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 35 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display*d, int i)); /* 36 */ + void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 37 */ + void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 38 */ + void (*xFreeCursor) _ANSI_ARGS_((Display*d, Cursor c)); /* 39 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 40 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 41 */ + void (*xGetInputFocus) _ANSI_ARGS_((Display*d, Window*w, int*i)); /* 42 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 43 */ + Status (*xGetWindowAttributes) _ANSI_ARGS_((Display*d, Window w, XWindowAttributes*x)); /* 44 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */ + int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 47 */ + Status (*xLookupColor) _ANSI_ARGS_((Display*d, Colormap c1, _Xconst char*c2, XColor*x1, XColor*x2)); /* 48 */ + void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 49 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */ + void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 51 */ + void (*xNextEvent) _ANSI_ARGS_((Display*d, XEvent*x)); /* 52 */ + void (*xPutBackEvent) _ANSI_ARGS_((Display*d, XEvent*x)); /* 53 */ + void (*xQueryColors) _ANSI_ARGS_((Display*d, Colormap c, XColor*x, int i)); /* 54 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 55 */ + Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 56 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 57 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 58 */ + void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */ + void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 60 */ + Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 61 */ + void (*xSetCommand) _ANSI_ARGS_((Display*d, Window w, CONST char**c, int i)); /* 62 */ + void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 63 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 64 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 65 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 66 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 67 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 68 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 69 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 70 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 71 */ + Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display*d, Window w1, Window w2, int i1, int i2, int*i3, int*i4, Window*w3)); /* 72 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 73 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 74 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 75 */ + void (*xWindowEvent) _ANSI_ARGS_((Display*d, Window w, long l, XEvent*x)); /* 76 */ void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 77 */ - Bool (*xFilterEvent) _ANSI_ARGS_((XEvent* x, Window w)); /* 78 */ - int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent* xk, char* c, int i, KeySym* k, Status* s)); /* 79 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 80 */ - void *reserved81; - Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 82 */ - GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 83 */ - void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 84 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 85 */ - void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 86 */ - void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 87 */ - void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 88 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */ - void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 91 */ - void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 92 */ - void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 93 */ - void (*xSetStipple) _ANSI_ARGS_((Display * display, GC gc, Pixmap stipple)); /* 94 */ - void (*xSetFillRule) _ANSI_ARGS_((Display * display, GC gc, int fill_rule)); /* 95 */ - void (*xSetFillStyle) _ANSI_ARGS_((Display * display, GC gc, int fill_style)); /* 96 */ - void (*xSetFunction) _ANSI_ARGS_((Display * display, GC gc, int function)); /* 97 */ - void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 98 */ - int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 99 */ + Bool (*xFilterEvent) _ANSI_ARGS_((XEvent*x, Window w)); /* 78 */ + int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent*xk, char*c, int i, KeySym*k, Status*s)); /* 79 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 80 */ + VOID *reserved81; + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 82 */ + GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 83 */ + void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 84 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 85 */ + void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 86 */ + void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 87 */ + void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 88 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */ + void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 91 */ + void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 92 */ + void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 93 */ + void (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 94 */ + void (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 95 */ + void (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 96 */ + void (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 97 */ + void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 98 */ + int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 99 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 100 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 101 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 102 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 103 */ - void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */ - void (*xWarpPointer) _ANSI_ARGS_((Display* d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */ - void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 101 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 102 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 103 */ + void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */ + void (*xWarpPointer) _ANSI_ARGS_((Display*d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */ + void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*xSetDashes) _ANSI_ARGS_((Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ + XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 6 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, KeyCode k, int i)); /* 8 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 9 */ - Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, KeyCode k, int i)); /* 8 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 9 */ + Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 10 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */ - Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 12 */ - void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 13 */ - void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 14 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 15 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 16 */ - void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ - void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 19 */ - void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 20 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 21 */ - void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ - void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 23 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ - void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ - void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 26 */ - void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 27 */ - void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 28 */ - void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 29 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 30 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 31 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 32 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ - int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 35 */ - void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 36 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ - void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 38 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 39 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 40 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 41 */ - void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ - void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 43 */ - Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 44 */ - void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 45 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 46 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 47 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 48 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 49 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 50 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 51 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 52 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 53 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 54 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 55 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 56 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ - Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 58 */ - GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 59 */ - void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 60 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 61 */ - void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 62 */ - void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 63 */ - void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 64 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ - void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 67 */ - void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 68 */ - void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 69 */ - void (*xSetStipple) _ANSI_ARGS_((Display * display, GC gc, Pixmap stipple)); /* 70 */ - void (*xSetFillRule) _ANSI_ARGS_((Display * display, GC gc, int fill_rule)); /* 71 */ - void (*xSetFillStyle) _ANSI_ARGS_((Display * display, GC gc, int fill_style)); /* 72 */ - void (*xSetFunction) _ANSI_ARGS_((Display * display, GC gc, int function)); /* 73 */ - void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ - int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 75 */ + Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 12 */ + void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 13 */ + void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 14 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 15 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 16 */ + void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ + void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 19 */ + void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 20 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 21 */ + void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ + void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 23 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ + void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ + void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 26 */ + void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 27 */ + void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 28 */ + void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 29 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 30 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 31 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 32 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ + int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 35 */ + void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 36 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ + void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 38 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 39 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 40 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 41 */ + void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ + void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 43 */ + Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 44 */ + void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 45 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 46 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 47 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 48 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 49 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 50 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 51 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 52 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 53 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 54 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 55 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 56 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 58 */ + GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 59 */ + void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 60 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 61 */ + void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 62 */ + void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 63 */ + void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 64 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ + void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */ + void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */ + void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */ + void (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 70 */ + void (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 71 */ + void (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 72 */ + void (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 73 */ + void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ + int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 77 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 78 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 79 */ - void (*xDrawSegments) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XSegment * segments, int nsegments)); /* 80 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */ - void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ - void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ - void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 84 */ - void (*xDrawPoint) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y)); /* 85 */ - void (*xDrawPoints) _ANSI_ARGS_((Display* display, Drawable d, GC gc, XPoint * points, int npoints, int mode)); /* 86 */ - void (*xWarpPointer) _ANSI_ARGS_((Display* display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ - void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */ - void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */ - Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 90 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 77 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 78 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 79 */ + void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display*display, int mode)); /* 81 */ + void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ + void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ + void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 84 */ + void (*xDrawPoint) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y)); /* 85 */ + void (*xDrawPoints) _ANSI_ARGS_((Display*display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ + void (*xWarpPointer) _ANSI_ARGS_((Display*display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ + void (*xQueryColor) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *def_in_out)); /* 88 */ + void (*xQueryColors) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 89 */ + Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 90 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*xSetDashes) _ANSI_ARGS_((Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ + XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 6 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, KeyCode k, int i)); /* 8 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 9 */ - Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, KeyCode k, int i)); /* 8 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 9 */ + Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 10 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */ - Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 12 */ - void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 13 */ - void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 14 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 15 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 16 */ - void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ - void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 19 */ - void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 20 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 21 */ - void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ - void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 23 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ - void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ - void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 26 */ - void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 27 */ - void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 28 */ - void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 29 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 30 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 31 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 32 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ - int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 35 */ - void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 36 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ - void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 38 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 39 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 40 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 41 */ - void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ - void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 43 */ - Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 44 */ - void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 45 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 46 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 47 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 48 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 49 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 50 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 51 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 52 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 53 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 54 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 55 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 56 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ - Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 58 */ - GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 59 */ - void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 60 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 61 */ - void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 62 */ - void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 63 */ - void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 64 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ - void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 67 */ - void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 68 */ - void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 69 */ - void (*xSetStipple) _ANSI_ARGS_((Display * display, GC gc, Pixmap stipple)); /* 70 */ - void (*xSetFillRule) _ANSI_ARGS_((Display * display, GC gc, int fill_rule)); /* 71 */ - void (*xSetFillStyle) _ANSI_ARGS_((Display * display, GC gc, int fill_style)); /* 72 */ - void (*xSetFunction) _ANSI_ARGS_((Display * display, GC gc, int function)); /* 73 */ - void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ - int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 75 */ + Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 12 */ + void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 13 */ + void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 14 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 15 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 16 */ + void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ + void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 19 */ + void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 20 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 21 */ + void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ + void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 23 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ + void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ + void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 26 */ + void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 27 */ + void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 28 */ + void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 29 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 30 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 31 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 32 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ + int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 35 */ + void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 36 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ + void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 38 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 39 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 40 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 41 */ + void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ + void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 43 */ + Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 44 */ + void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 45 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 46 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 47 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 48 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 49 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 50 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 51 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 52 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 53 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 54 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 55 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 56 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 58 */ + GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 59 */ + void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 60 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 61 */ + void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 62 */ + void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 63 */ + void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 64 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ + void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */ + void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */ + void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */ + void (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 70 */ + void (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 71 */ + void (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 72 */ + void (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 73 */ + void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ + int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 77 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 78 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 79 */ - void (*xDrawSegments) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XSegment * segments, int nsegments)); /* 80 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */ - void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ - void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ - void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 84 */ - void (*xDrawPoint) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y)); /* 85 */ - void (*xDrawPoints) _ANSI_ARGS_((Display* display, Drawable d, GC gc, XPoint * points, int npoints, int mode)); /* 86 */ - void (*xWarpPointer) _ANSI_ARGS_((Display* display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ - void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */ - void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */ - Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 90 */ - int (*xSync) _ANSI_ARGS_((Display * display, Bool flag)); /* 91 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 77 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 78 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 79 */ + void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display*display, int mode)); /* 81 */ + void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ + void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ + void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 84 */ + void (*xDrawPoint) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y)); /* 85 */ + void (*xDrawPoints) _ANSI_ARGS_((Display*display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ + void (*xWarpPointer) _ANSI_ARGS_((Display*display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ + void (*xQueryColor) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *def_in_out)); /* 88 */ + void (*xQueryColors) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 89 */ + Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 90 */ + int (*xSync) _ANSI_ARGS_((Display *display, Bool flag)); /* 91 */ #endif /* MAC_OSX_TK */ } TkIntXlibStubs; diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index f38f93b..ecc5919 100644 --- a/generic/tkPlatDecls.h +++ b/generic/tkPlatDecls.h @@ -31,7 +31,7 @@ #ifdef __WIN32__ /* 0 */ -EXTERN Window Tk_AttachHWND _ANSI_ARGS_((Tk_Window tkwin, +EXTERN Window Tk_AttachHWND _ANSI_ARGS_((Tk_Window tkwin, HWND hwnd)); /* 1 */ EXTERN HINSTANCE Tk_GetHINSTANCE _ANSI_ARGS_((void)); @@ -42,39 +42,37 @@ EXTERN Tk_Window Tk_HWNDToWindow _ANSI_ARGS_((HWND hwnd)); /* 4 */ EXTERN void Tk_PointerEvent _ANSI_ARGS_((HWND hwnd, int x, int y)); /* 5 */ -EXTERN int Tk_TranslateWinEvent _ANSI_ARGS_((HWND hwnd, - UINT message, WPARAM wParam, LPARAM lParam, - LRESULT * result)); +EXTERN int Tk_TranslateWinEvent _ANSI_ARGS_((HWND hwnd, + UINT message, WPARAM wParam, LPARAM lParam, + LRESULT *result)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 0 */ EXTERN void Tk_MacSetEmbedHandler _ANSI_ARGS_(( - Tk_MacEmbedRegisterWinProc * registerWinProcPtr, - Tk_MacEmbedGetGrafPortProc * getPortProcPtr, - Tk_MacEmbedMakeContainerExistProc * containerExistProcPtr, - Tk_MacEmbedGetClipProc * getClipProc, - Tk_MacEmbedGetOffsetInParentProc * getOffsetProc)); + Tk_MacEmbedRegisterWinProc *registerWinProcPtr, + Tk_MacEmbedGetGrafPortProc *getPortProcPtr, + Tk_MacEmbedMakeContainerExistProc *containerExistProcPtr, + Tk_MacEmbedGetClipProc *getClipProc, + Tk_MacEmbedGetOffsetInParentProc *getOffsetProc)); /* 1 */ EXTERN void Tk_MacTurnOffMenus _ANSI_ARGS_((void)); /* 2 */ EXTERN void Tk_MacTkOwnsCursor _ANSI_ARGS_((int tkOwnsIt)); /* 3 */ -EXTERN void TkMacInitMenus _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN void TkMacInitMenus _ANSI_ARGS_((Tcl_Interp *interp)); /* 4 */ -EXTERN void TkMacInitAppleEvents _ANSI_ARGS_(( - Tcl_Interp * interp)); +EXTERN void TkMacInitAppleEvents _ANSI_ARGS_((Tcl_Interp *interp)); /* 5 */ -EXTERN int TkMacConvertEvent _ANSI_ARGS_(( - EventRecord * eventPtr)); +EXTERN int TkMacConvertEvent _ANSI_ARGS_((EventRecord *eventPtr)); /* 6 */ EXTERN int TkMacConvertTkEvent _ANSI_ARGS_(( - EventRecord * eventPtr, Window window)); + EventRecord *eventPtr, Window window)); /* 7 */ -EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, - int x, int y, int width, int height, +EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, + int x, int y, int width, int height, int flags)); /* 8 */ -EXTERN void TkMacInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkMacInvalClipRgns _ANSI_ARGS_((TkWindow *winPtr)); /* 9 */ EXTERN int TkMacHaveAppearance _ANSI_ARGS_((void)); /* 10 */ @@ -83,23 +81,23 @@ EXTERN GWorldPtr TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable)); #ifdef MAC_OSX_TK /* 0 */ EXTERN void Tk_MacOSXSetEmbedHandler _ANSI_ARGS_(( - Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, - Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, - Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, - Tk_MacOSXEmbedGetClipProc * getClipProc, - Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc)); + Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, + Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, + Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, + Tk_MacOSXEmbedGetClipProc *getClipProc, + Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc)); /* 1 */ EXTERN void Tk_MacOSXTurnOffMenus _ANSI_ARGS_((void)); /* 2 */ EXTERN void Tk_MacOSXTkOwnsCursor _ANSI_ARGS_((int tkOwnsIt)); /* 3 */ -EXTERN void TkMacOSXInitMenus _ANSI_ARGS_((Tcl_Interp * interp)); +EXTERN void TkMacOSXInitMenus _ANSI_ARGS_((Tcl_Interp *interp)); /* 4 */ EXTERN void TkMacOSXInitAppleEvents _ANSI_ARGS_(( - Tcl_Interp * interp)); + Tcl_Interp *interp)); /* 5 */ -EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, - int x, int y, int width, int height, +EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, + int x, int y, int width, int height, int flags)); /* 6 */ EXTERN void TkMacOSXInvalClipRgns _ANSI_ARGS_((Tk_Window tkwin)); @@ -125,27 +123,27 @@ typedef struct TkPlatStubs { HWND (*tk_GetHWND) _ANSI_ARGS_((Window window)); /* 2 */ Tk_Window (*tk_HWNDToWindow) _ANSI_ARGS_((HWND hwnd)); /* 3 */ void (*tk_PointerEvent) _ANSI_ARGS_((HWND hwnd, int x, int y)); /* 4 */ - int (*tk_TranslateWinEvent) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT * result)); /* 5 */ + int (*tk_TranslateWinEvent) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result)); /* 5 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tk_MacSetEmbedHandler) _ANSI_ARGS_((Tk_MacEmbedRegisterWinProc * registerWinProcPtr, Tk_MacEmbedGetGrafPortProc * getPortProcPtr, Tk_MacEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacEmbedGetClipProc * getClipProc, Tk_MacEmbedGetOffsetInParentProc * getOffsetProc)); /* 0 */ + void (*tk_MacSetEmbedHandler) _ANSI_ARGS_((Tk_MacEmbedRegisterWinProc *registerWinProcPtr, Tk_MacEmbedGetGrafPortProc *getPortProcPtr, Tk_MacEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacEmbedGetClipProc *getClipProc, Tk_MacEmbedGetOffsetInParentProc *getOffsetProc)); /* 0 */ void (*tk_MacTurnOffMenus) _ANSI_ARGS_((void)); /* 1 */ void (*tk_MacTkOwnsCursor) _ANSI_ARGS_((int tkOwnsIt)); /* 2 */ - void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 3 */ - void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 4 */ - int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord * eventPtr)); /* 5 */ - int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord * eventPtr, Window window)); /* 6 */ + void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp *interp)); /* 3 */ + void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp *interp)); /* 4 */ + int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord *eventPtr)); /* 5 */ + int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord *eventPtr, Window window)); /* 6 */ void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 7 */ - void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 8 */ + void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow *winPtr)); /* 8 */ int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 9 */ GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 10 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tk_MacOSXSetEmbedHandler) _ANSI_ARGS_((Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacOSXEmbedGetClipProc * getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc)); /* 0 */ + void (*tk_MacOSXSetEmbedHandler) _ANSI_ARGS_((Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc)); /* 0 */ void (*tk_MacOSXTurnOffMenus) _ANSI_ARGS_((void)); /* 1 */ void (*tk_MacOSXTkOwnsCursor) _ANSI_ARGS_((int tkOwnsIt)); /* 2 */ - void (*tkMacOSXInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 3 */ - void (*tkMacOSXInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 4 */ + void (*tkMacOSXInitMenus) _ANSI_ARGS_((Tcl_Interp *interp)); /* 3 */ + void (*tkMacOSXInitAppleEvents) _ANSI_ARGS_((Tcl_Interp *interp)); /* 4 */ void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 5 */ void (*tkMacOSXInvalClipRgns) _ANSI_ARGS_((Tk_Window tkwin)); /* 6 */ GWorldPtr (*tkMacOSXGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 7 */ -- cgit v0.12 From a3c8bde133c8b45cb260d20994d845acc133f071 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 11 Apr 2012 22:03:53 +0000 Subject: sync tcl.m4 with Tcl, format tkInt.decls like Tk8.5/8.6 --- generic/tkInt.decls | 1977 +++++++++++++++++----------------------------- generic/tkIntDecls.h | 54 +- generic/tkIntPlatDecls.h | 8 +- generic/tkIntXlibDecls.h | 1187 ++++++++++++++-------------- generic/tkMain.c | 2 +- unix/configure | 236 +++--- unix/tcl.m4 | 1 + win/configure | 308 ++++---- win/configure.in | 14 +- win/tcl.m4 | 11 +- 10 files changed, 1638 insertions(+), 2160 deletions(-) diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 9ecfb72..e1f4ffc 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -1,695 +1,493 @@ - # tkInt.decls -- +# tkInt.decls -- # -# This file contains the declarations for all unsupported -# functions that are exported by the Tk library. This file -# is used to generate the tkIntDecls.h, tkIntPlatDecls.h, -# tkIntStub.c, and tkPlatStub.c files. +# This file contains the declarations for all unsupported functions that +# are exported by the Tk library. This file is used to generate the +# tkIntDecls.h, tkIntPlatDecls.h, tkIntStub.c, and tkPlatStub.c files. # # Copyright (c) 1998-1999 by Scriptics Corporation. # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. library tk + +############################################################################## # Define the unsupported generic interfaces. interface tkInt -# Declare each of the functions in the unsupported internal Tcl -# interface. These interfaces are allowed to changed between versions. -# Use at your own risk. Note that the position of functions should not -# be changed between versions to avoid gratuitous incompatibilities. +# Declare each of the functions in the unsupported internal Tcl interface. +# These interfaces are allowed to changed between versions. Use at your own +# risk. Note that the position of functions should not be changed between +# versions to avoid gratuitous incompatibilities. -declare 0 generic { - TkWindow * TkAllocWindow (TkDisplay *dispPtr, int screenNum, \ +declare 0 { + TkWindow *TkAllocWindow(TkDisplay *dispPtr, int screenNum, TkWindow *parentPtr) } - -declare 1 generic { - void TkBezierPoints (double control[], int numSteps, double *coordPtr) +declare 1 { + void TkBezierPoints(double control[], int numSteps, double *coordPtr) } - -declare 2 generic { - void TkBezierScreenPoints (Tk_Canvas canvas, double control[], \ +declare 2 { + void TkBezierScreenPoints(Tk_Canvas canvas, double control[], int numSteps, XPoint *xPointPtr) } - -declare 3 generic { - void TkBindDeadWindow (TkWindow *winPtr) +declare 3 { + void TkBindDeadWindow(TkWindow *winPtr) } - -declare 4 generic { - void TkBindEventProc (TkWindow *winPtr, XEvent *eventPtr) +declare 4 { + void TkBindEventProc(TkWindow *winPtr, XEvent *eventPtr) } - -declare 5 generic { - void TkBindFree (TkMainInfo *mainPtr) +declare 5 { + void TkBindFree(TkMainInfo *mainPtr) } - -declare 6 generic { - void TkBindInit (TkMainInfo *mainPtr) +declare 6 { + void TkBindInit(TkMainInfo *mainPtr) } - -declare 7 generic { - void TkChangeEventWindow (XEvent *eventPtr, TkWindow *winPtr) +declare 7 { + void TkChangeEventWindow(XEvent *eventPtr, TkWindow *winPtr) } - -declare 8 generic { - int TkClipInit (Tcl_Interp *interp, TkDisplay *dispPtr) +declare 8 { + int TkClipInit(Tcl_Interp *interp, TkDisplay *dispPtr) } - -declare 9 generic { - void TkComputeAnchor (Tk_Anchor anchor, Tk_Window tkwin, \ - int padX, int padY, int innerWidth, int innerHeight, \ - int *xPtr, int *yPtr) +declare 9 { + void TkComputeAnchor(Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, + int innerWidth, int innerHeight, int *xPtr, int *yPtr) } - -declare 10 generic { - int TkCopyAndGlobalEval (Tcl_Interp *interp, char *script) +declare 10 { + int TkCopyAndGlobalEval(Tcl_Interp *interp, char *script) } - -declare 11 generic { - unsigned long TkCreateBindingProcedure (Tcl_Interp *interp, \ - Tk_BindingTable bindingTable, \ - ClientData object, CONST char *eventString, \ - TkBindEvalProc *evalProc, TkBindFreeProc *freeProc, \ - ClientData clientData) +declare 11 { + unsigned long TkCreateBindingProcedure(Tcl_Interp *interp, + Tk_BindingTable bindingTable, ClientData object, + const char *eventString, TkBindEvalProc *evalProc, + TkBindFreeProc *freeProc, ClientData clientData) } - -declare 12 generic { - TkCursor * TkCreateCursorFromData (Tk_Window tkwin, \ - CONST char *source, CONST char *mask, int width, int height, \ +declare 12 { + TkCursor *TkCreateCursorFromData(Tk_Window tkwin, + const char *source, const char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg) } - -declare 13 generic { - int TkCreateFrame (ClientData clientData, \ - Tcl_Interp *interp, int argc, char **argv, \ - int toplevel, char *appName) +declare 13 { + int TkCreateFrame(ClientData clientData, Tcl_Interp *interp, + int argc, char **argv, int toplevel, char *appName) } - -declare 14 generic { - Tk_Window TkCreateMainWindow (Tcl_Interp *interp, \ - CONST char *screenName, char *baseName) +declare 14 { + Tk_Window TkCreateMainWindow(Tcl_Interp *interp, + const char *screenName, char *baseName) } - -declare 15 generic { - Time TkCurrentTime (TkDisplay *dispPtr) +declare 15 { + Time TkCurrentTime(TkDisplay *dispPtr) } - -declare 16 generic { - void TkDeleteAllImages (TkMainInfo *mainPtr) +declare 16 { + void TkDeleteAllImages(TkMainInfo *mainPtr) } - -declare 17 generic { - void TkDoConfigureNotify (TkWindow *winPtr) +declare 17 { + void TkDoConfigureNotify(TkWindow *winPtr) } - -declare 18 generic { - void TkDrawInsetFocusHighlight (Tk_Window tkwin, GC gc, int width, \ +declare 18 { + void TkDrawInsetFocusHighlight(Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding) } - -declare 19 generic { - void TkEventDeadWindow (TkWindow *winPtr) +declare 19 { + void TkEventDeadWindow(TkWindow *winPtr) } - -declare 20 generic { - void TkFillPolygon (Tk_Canvas canvas, \ - double *coordPtr, int numPoints, Display *display, \ - Drawable drawable, GC gc, GC outlineGC) +declare 20 { + void TkFillPolygon(Tk_Canvas canvas, double *coordPtr, int numPoints, + Display *display, Drawable drawable, GC gc, GC outlineGC) } - -declare 21 generic { - int TkFindStateNum (Tcl_Interp *interp, \ - CONST char *option, CONST TkStateMap *mapPtr, \ - CONST char *strKey) +declare 21 { + int TkFindStateNum(Tcl_Interp *interp, const char *option, + const TkStateMap *mapPtr, const char *strKey) } - -declare 22 generic { - char * TkFindStateString (CONST TkStateMap *mapPtr, int numKey) +declare 22 { + char *TkFindStateString(const TkStateMap *mapPtr, int numKey) } - -declare 23 generic { - void TkFocusDeadWindow (TkWindow *winPtr) +declare 23 { + void TkFocusDeadWindow(TkWindow *winPtr) } - -declare 24 generic { - int TkFocusFilterEvent (TkWindow *winPtr, XEvent *eventPtr) +declare 24 { + int TkFocusFilterEvent(TkWindow *winPtr, XEvent *eventPtr) } - -declare 25 generic { - TkWindow * TkFocusKeyEvent (TkWindow *winPtr, XEvent *eventPtr) +declare 25 { + TkWindow *TkFocusKeyEvent(TkWindow *winPtr, XEvent *eventPtr) } - -declare 26 generic { - void TkFontPkgInit (TkMainInfo *mainPtr) +declare 26 { + void TkFontPkgInit(TkMainInfo *mainPtr) } - -declare 27 generic { - void TkFontPkgFree (TkMainInfo *mainPtr) +declare 27 { + void TkFontPkgFree(TkMainInfo *mainPtr) } - -declare 28 generic { - void TkFreeBindingTags (TkWindow *winPtr) +declare 28 { + void TkFreeBindingTags(TkWindow *winPtr) } # Name change only, TkFreeCursor in Tcl 8.0.x now TkpFreeCursor -declare 29 generic { - void TkpFreeCursor (TkCursor *cursorPtr) +declare 29 { + void TkpFreeCursor(TkCursor *cursorPtr) } - -declare 30 generic { - char * TkGetBitmapData (Tcl_Interp *interp, \ - char *string, char *fileName, int *widthPtr, \ - int *heightPtr, int *hotXPtr, int *hotYPtr) +declare 30 { + char *TkGetBitmapData(Tcl_Interp *interp, char *string, + char *fileName, int *widthPtr, int *heightPtr, + int *hotXPtr, int *hotYPtr) } - -declare 31 generic { - void TkGetButtPoints (double p1[], double p2[], \ +declare 31 { + void TkGetButtPoints(double p1[], double p2[], double width, int project, double m1[], double m2[]) } - -declare 32 generic { - TkCursor * TkGetCursorByName (Tcl_Interp *interp, \ +declare 32 { + TkCursor *TkGetCursorByName(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string) } - -declare 33 generic { - CONST84_RETURN char * TkGetDefaultScreenName (Tcl_Interp *interp, \ - CONST char *screenName) +declare 33 { + CONST84_RETURN char *TkGetDefaultScreenName(Tcl_Interp *interp, + const char *screenName) } - -declare 34 generic { - TkDisplay * TkGetDisplay (Display *display) +declare 34 { + TkDisplay *TkGetDisplay(Display *display) } - -declare 35 generic { - int TkGetDisplayOf (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], \ +declare 35 { + int TkGetDisplayOf(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tk_Window *tkwinPtr) } - -declare 36 generic { - TkWindow * TkGetFocusWin (TkWindow *winPtr) +declare 36 { + TkWindow *TkGetFocusWin(TkWindow *winPtr) } - -declare 37 generic { - int TkGetInterpNames (Tcl_Interp *interp, Tk_Window tkwin) +declare 37 { + int TkGetInterpNames(Tcl_Interp *interp, Tk_Window tkwin) } - -declare 38 generic { - int TkGetMiterPoints (double p1[], double p2[], double p3[], \ - double width, double m1[],double m2[]) +declare 38 { + int TkGetMiterPoints(double p1[], double p2[], double p3[], + double width, double m1[], double m2[]) } - -declare 39 generic { - void TkGetPointerCoords (Tk_Window tkwin, int *xPtr, int *yPtr) +declare 39 { + void TkGetPointerCoords(Tk_Window tkwin, int *xPtr, int *yPtr) } - -declare 40 generic { - void TkGetServerInfo (Tcl_Interp *interp, Tk_Window tkwin) +declare 40 { + void TkGetServerInfo(Tcl_Interp *interp, Tk_Window tkwin) } - -declare 41 generic { - void TkGrabDeadWindow (TkWindow *winPtr) +declare 41 { + void TkGrabDeadWindow(TkWindow *winPtr) } - -declare 42 generic { - int TkGrabState (TkWindow *winPtr) +declare 42 { + int TkGrabState(TkWindow *winPtr) } - -declare 43 generic { - void TkIncludePoint (Tk_Item *itemPtr, double *pointPtr) +declare 43 { + void TkIncludePoint(Tk_Item *itemPtr, double *pointPtr) } - -declare 44 generic { - void TkInOutEvents (XEvent *eventPtr, TkWindow *sourcePtr, \ - TkWindow *destPtr, int leaveType, int enterType, \ +declare 44 { + void TkInOutEvents(XEvent *eventPtr, TkWindow *sourcePtr, + TkWindow *destPtr, int leaveType, int enterType, Tcl_QueuePosition position) } - -declare 45 generic { - void TkInstallFrameMenu (Tk_Window tkwin) +declare 45 { + void TkInstallFrameMenu(Tk_Window tkwin) } - -declare 46 generic { - char * TkKeysymToString (KeySym keysym) +declare 46 { + char *TkKeysymToString(KeySym keysym) } - -declare 47 generic { - int TkLineToArea (double end1Ptr[], double end2Ptr[], double rectPtr[]) +declare 47 { + int TkLineToArea(double end1Ptr[], double end2Ptr[], double rectPtr[]) } - -declare 48 generic { - double TkLineToPoint (double end1Ptr[], \ - double end2Ptr[], double pointPtr[]) +declare 48 { + double TkLineToPoint(double end1Ptr[], double end2Ptr[], double pointPtr[]) } - -declare 49 generic { - int TkMakeBezierCurve (Tk_Canvas canvas, \ - double *pointPtr, int numPoints, int numSteps, \ - XPoint xPoints[], double dblPoints[]) +declare 49 { + int TkMakeBezierCurve(Tk_Canvas canvas, double *pointPtr, int numPoints, + int numSteps, XPoint xPoints[], double dblPoints[]) } - -declare 50 generic { - void TkMakeBezierPostscript (Tcl_Interp *interp, \ +declare 50 { + void TkMakeBezierPostscript(Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints) } - -declare 51 generic { - void TkOptionClassChanged (TkWindow *winPtr) +declare 51 { + void TkOptionClassChanged(TkWindow *winPtr) } - -declare 52 generic { - void TkOptionDeadWindow (TkWindow *winPtr) +declare 52 { + void TkOptionDeadWindow(TkWindow *winPtr) } - -declare 53 generic { - int TkOvalToArea (double *ovalPtr, double *rectPtr) +declare 53 { + int TkOvalToArea(double *ovalPtr, double *rectPtr) } - -declare 54 generic { - double TkOvalToPoint (double ovalPtr[], \ +declare 54 { + double TkOvalToPoint(double ovalPtr[], double width, int filled, double pointPtr[]) } - -declare 55 generic { - int TkpChangeFocus (TkWindow *winPtr, int force) +declare 55 { + int TkpChangeFocus(TkWindow *winPtr, int force) } - -declare 56 generic { - void TkpCloseDisplay (TkDisplay *dispPtr) +declare 56 { + void TkpCloseDisplay(TkDisplay *dispPtr) } - -declare 57 generic { - void TkpClaimFocus (TkWindow *topLevelPtr, int force) +declare 57 { + void TkpClaimFocus(TkWindow *topLevelPtr, int force) } - -declare 58 generic { - void TkpDisplayWarning (CONST char *msg, CONST char *title) +declare 58 { + void TkpDisplayWarning( const char *msg, const char *title) } - -declare 59 generic { - void TkpGetAppName (Tcl_Interp *interp, Tcl_DString *name) +declare 59 { + void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name) } - -declare 60 generic { - TkWindow * TkpGetOtherWindow (TkWindow *winPtr) +declare 60 { + TkWindow *TkpGetOtherWindow(TkWindow *winPtr) } - -declare 61 generic { - TkWindow * TkpGetWrapperWindow (TkWindow *winPtr) +declare 61 { + TkWindow *TkpGetWrapperWindow(TkWindow *winPtr) } - -declare 62 generic { - int TkpInit (Tcl_Interp *interp) +declare 62 { + int TkpInit(Tcl_Interp *interp) } - -declare 63 generic { - void TkpInitializeMenuBindings (Tcl_Interp *interp, \ +declare 63 { + void TkpInitializeMenuBindings(Tcl_Interp *interp, Tk_BindingTable bindingTable) } - -declare 64 generic { - void TkpMakeContainer (Tk_Window tkwin) +declare 64 { + void TkpMakeContainer(Tk_Window tkwin) } - -declare 65 generic { - void TkpMakeMenuWindow (Tk_Window tkwin, int transient) +declare 65 { + void TkpMakeMenuWindow(Tk_Window tkwin, int transient) } - -declare 66 generic { - Window TkpMakeWindow (TkWindow *winPtr, Window parent) +declare 66 { + Window TkpMakeWindow(TkWindow *winPtr, Window parent) } - -declare 67 generic { - void TkpMenuNotifyToplevelCreate (Tcl_Interp *interp1, char *menuName) +declare 67 { + void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp, char *menuName) } - -declare 68 generic { - TkDisplay * TkpOpenDisplay (CONST char *display_name) +declare 68 { + TkDisplay *TkpOpenDisplay( const char *display_name) } - -declare 69 generic { - int TkPointerEvent (XEvent *eventPtr, TkWindow *winPtr) +declare 69 { + int TkPointerEvent(XEvent *eventPtr, TkWindow *winPtr) } - -declare 70 generic { - int TkPolygonToArea (double *polyPtr, int numPoints, double *rectPtr) +declare 70 { + int TkPolygonToArea(double *polyPtr, int numPoints, double *rectPtr) } - -declare 71 generic { - double TkPolygonToPoint (double *polyPtr, int numPoints, double *pointPtr) +declare 71 { + double TkPolygonToPoint(double *polyPtr, int numPoints, double *pointPtr) } - -declare 72 generic { - int TkPositionInTree (TkWindow *winPtr, TkWindow *treePtr) +declare 72 { + int TkPositionInTree(TkWindow *winPtr, TkWindow *treePtr) } - -declare 73 generic { - void TkpRedirectKeyEvent (TkWindow *winPtr, XEvent *eventPtr) +declare 73 { + void TkpRedirectKeyEvent(TkWindow *winPtr, XEvent *eventPtr) } - -declare 74 generic { - void TkpSetMainMenubar (Tcl_Interp *interp, \ - Tk_Window tkwin, char *menuName) +declare 74 { + void TkpSetMainMenubar(Tcl_Interp *interp, Tk_Window tkwin, char *menuName) } - -declare 75 generic { - int TkpUseWindow (Tcl_Interp *interp, Tk_Window tkwin, CONST char *string) +declare 75 { + int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, const char *string) } - -declare 76 generic { - int TkpWindowWasRecentlyDeleted (Window win, TkDisplay *dispPtr) +declare 76 { + int TkpWindowWasRecentlyDeleted(Window win, TkDisplay *dispPtr) } - -declare 77 generic { - void TkQueueEventForAllChildren (TkWindow *winPtr, XEvent *eventPtr) +declare 77 { + void TkQueueEventForAllChildren(TkWindow *winPtr, XEvent *eventPtr) } - -declare 78 generic { - int TkReadBitmapFile (Display* display, Drawable d, CONST char* filename, \ - unsigned int* width_return, unsigned int* height_return, \ - Pixmap* bitmap_return, int* x_hot_return, int* y_hot_return) +declare 78 { + int TkReadBitmapFile(Display *display, Drawable d, const char *filename, + unsigned int *width_return, unsigned int *height_return, + Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return) } - -declare 79 generic { - int TkScrollWindow (Tk_Window tkwin, GC gc, \ - int x, int y, int width, int height, int dx, \ - int dy, TkRegion damageRgn) +declare 79 { + int TkScrollWindow(Tk_Window tkwin, GC gc, int x, int y, + int width, int height, int dx, int dy, TkRegion damageRgn) } - -declare 80 generic { - void TkSelDeadWindow (TkWindow *winPtr) +declare 80 { + void TkSelDeadWindow(TkWindow *winPtr) } - -declare 81 generic { - void TkSelEventProc (Tk_Window tkwin, XEvent *eventPtr) +declare 81 { + void TkSelEventProc(Tk_Window tkwin, XEvent *eventPtr) } - -declare 82 generic { - void TkSelInit (Tk_Window tkwin) +declare 82 { + void TkSelInit(Tk_Window tkwin) } - -declare 83 generic { - void TkSelPropProc (XEvent *eventPtr) +declare 83 { + void TkSelPropProc(XEvent *eventPtr) } # Exported publically as Tk_SetClassProcs in 8.4a2 -#declare 84 generic { -# void TkSetClassProcs (Tk_Window tkwin, \ +#declare 84 { +# void TkSetClassProcs(Tk_Window tkwin, # TkClassProcs *procs, ClientData instanceData) #} - -declare 85 generic { - void TkSetWindowMenuBar (Tcl_Interp *interp, \ - Tk_Window tkwin, char *oldMenuName, char *menuName) +declare 85 { + void TkSetWindowMenuBar(Tcl_Interp *interp, Tk_Window tkwin, + char *oldMenuName, char *menuName) } - -declare 86 generic { - KeySym TkStringToKeysym (char *name) +declare 86 { + KeySym TkStringToKeysym(char *name) } - -declare 87 generic { - int TkThickPolyLineToArea (double *coordPtr, \ - int numPoints, double width, int capStyle, \ - int joinStyle, double *rectPtr) +declare 87 { + int TkThickPolyLineToArea(double *coordPtr, int numPoints, + double width, int capStyle, int joinStyle, double *rectPtr) } - -declare 88 generic { - void TkWmAddToColormapWindows (TkWindow *winPtr) +declare 88 { + void TkWmAddToColormapWindows(TkWindow *winPtr) } - -declare 89 generic { - void TkWmDeadWindow (TkWindow *winPtr) +declare 89 { + void TkWmDeadWindow(TkWindow *winPtr) } - -declare 90 generic { - TkWindow * TkWmFocusToplevel (TkWindow *winPtr) +declare 90 { + TkWindow *TkWmFocusToplevel(TkWindow *winPtr) } - -declare 91 generic { - void TkWmMapWindow (TkWindow *winPtr) +declare 91 { + void TkWmMapWindow(TkWindow *winPtr) } - -declare 92 generic { - void TkWmNewWindow (TkWindow *winPtr) +declare 92 { + void TkWmNewWindow(TkWindow *winPtr) } - -declare 93 generic { - void TkWmProtocolEventProc (TkWindow *winPtr, XEvent *evenvPtr) +declare 93 { + void TkWmProtocolEventProc(TkWindow *winPtr, XEvent *evenvPtr) } - -declare 94 generic { - void TkWmRemoveFromColormapWindows (TkWindow *winPtr) +declare 94 { + void TkWmRemoveFromColormapWindows(TkWindow *winPtr) } - -declare 95 generic { - void TkWmRestackToplevel (TkWindow *winPtr, int aboveBelow, \ +declare 95 { + void TkWmRestackToplevel(TkWindow *winPtr, int aboveBelow, TkWindow *otherPtr) } - -declare 96 generic { - void TkWmSetClass (TkWindow *winPtr) +declare 96 { + void TkWmSetClass(TkWindow *winPtr) } - -declare 97 generic { - void TkWmUnmapWindow (TkWindow *winPtr) +declare 97 { + void TkWmUnmapWindow(TkWindow *winPtr) } # new for 8.1 -declare 98 generic { - Tcl_Obj * TkDebugBitmap ( Tk_Window tkwin, char *name) +declare 98 { + Tcl_Obj *TkDebugBitmap(Tk_Window tkwin, char *name) } - -declare 99 generic { - Tcl_Obj * TkDebugBorder ( Tk_Window tkwin, char *name) +declare 99 { + Tcl_Obj *TkDebugBorder(Tk_Window tkwin, char *name) } - -declare 100 generic { - Tcl_Obj * TkDebugCursor ( Tk_Window tkwin, char *name) +declare 100 { + Tcl_Obj *TkDebugCursor(Tk_Window tkwin, char *name) } - -declare 101 generic { - Tcl_Obj * TkDebugColor ( Tk_Window tkwin, char *name) +declare 101 { + Tcl_Obj *TkDebugColor(Tk_Window tkwin, char *name) } - -declare 102 generic { - Tcl_Obj * TkDebugConfig (Tcl_Interp *interp, Tk_OptionTable table) +declare 102 { + Tcl_Obj *TkDebugConfig(Tcl_Interp *interp, Tk_OptionTable table) } - -declare 103 generic { - Tcl_Obj * TkDebugFont ( Tk_Window tkwin, char *name) +declare 103 { + Tcl_Obj *TkDebugFont(Tk_Window tkwin, char *name) } - -declare 104 generic { - int TkFindStateNumObj (Tcl_Interp *interp, \ - Tcl_Obj *optionPtr, CONST TkStateMap *mapPtr, \ - Tcl_Obj *keyPtr) +declare 104 { + int TkFindStateNumObj(Tcl_Interp *interp, Tcl_Obj *optionPtr, + const TkStateMap *mapPtr, Tcl_Obj *keyPtr) } - -declare 105 generic { - Tcl_HashTable * TkGetBitmapPredefTable (void) +declare 105 { + Tcl_HashTable *TkGetBitmapPredefTable(void) } - -declare 106 generic { - TkDisplay * TkGetDisplayList (void) +declare 106 { + TkDisplay *TkGetDisplayList(void) } - -declare 107 generic { - TkMainInfo * TkGetMainInfoList (void) +declare 107 { + TkMainInfo *TkGetMainInfoList(void) } - -declare 108 generic { - int TkGetWindowFromObj (Tcl_Interp *interp, \ - Tk_Window tkwin, Tcl_Obj *objPtr, \ - Tk_Window *windowPtr) +declare 108 { + int TkGetWindowFromObj(Tcl_Interp *interp, Tk_Window tkwin, + Tcl_Obj *objPtr, Tk_Window *windowPtr) } - -declare 109 generic { - char * TkpGetString (TkWindow *winPtr, \ - XEvent *eventPtr, Tcl_DString *dsPtr) +declare 109 { + char *TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr) } - -declare 110 generic { - void TkpGetSubFonts (Tcl_Interp *interp, Tk_Font tkfont) +declare 110 { + void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont) } - -declare 111 generic { - Tcl_Obj * TkpGetSystemDefault (Tk_Window tkwin, \ - CONST char *dbName, CONST char *className) +declare 111 { + Tcl_Obj *TkpGetSystemDefault(Tk_Window tkwin, + const char *dbName, const char *className) } - -declare 112 generic { - void TkpMenuThreadInit (void) +declare 112 { + void TkpMenuThreadInit(void) } - -declare 113 {mac aqua win} { - void TkClipBox (TkRegion rgn, XRectangle* rect_return) +declare 113 {mac aqua win} { + void TkClipBox(TkRegion rgn, XRectangle *rect_return) } - -declare 114 {mac aqua win} { - TkRegion TkCreateRegion (void) +declare 114 {mac aqua win} { + TkRegion TkCreateRegion(void) } - declare 115 {mac aqua win} { - void TkDestroyRegion (TkRegion rgn) + void TkDestroyRegion(TkRegion rgn) } - declare 116 {mac aqua win} { - void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) + void TkIntersectRegion(TkRegion sra, TkRegion srcb, TkRegion dr_return) } - declare 117 {mac aqua win} { - int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ + int TkRectInRegion(TkRegion rgn, int x, int y, unsigned int width, unsigned int height) } - declare 118 {mac aqua win} { - void TkSetRegion (Display* display, GC gc, TkRegion rgn) + void TkSetRegion(Display *display, GC gc, TkRegion rgn) } - declare 119 {mac aqua win} { - void TkUnionRectWithRegion (XRectangle* rect, \ + void TkUnionRectWithRegion(XRectangle *rect, TkRegion src, TkRegion dr_return) } - -# removed duplicate from tkIntPlat table -#declare 120 mac { -# void TkGenerateActivateEvents (TkWindow *winPtr, int active) -#} - declare 121 {mac aqua} { - Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) + Pixmap TkpCreateNativeBitmap(Display *display, const char *source) } - declare 122 {mac aqua} { - void TkpDefineNativeBitmaps (void) + void TkpDefineNativeBitmaps(void) } - -# removed duplicate from tkIntPlat table -#declare 123 mac { -# unsigned long TkpGetMS (void) -#} - declare 124 {mac aqua} { - Pixmap TkpGetNativeAppBitmap (Display *display, \ - CONST char *name, int *width, int *height) + Pixmap TkpGetNativeAppBitmap(Display *display, + const char *name, int *width, int *height) } - -# removed duplicates from tkIntPlat table -#declare 125 mac { -# void TkPointerDeadWindow (TkWindow *winPtr) -#} -# -#declare 126 mac { -# void TkpSetCapture (TkWindow *winPtr) -#} -# -#declare 127 mac { -# void TkpSetCursor (TkpCursor cursor) -#} -# -#declare 128 mac { -# void TkpWmSetState (TkWindow *winPtr, int state) -#} -# -#declare 130 mac { -# Window TkGetTransientMaster (TkWindow *winPtr) -#} -# -#declare 131 mac { -# int TkGenerateButtonEvent (int x, int y, \ -# Window window, unsigned int state) -#} -# -#declare 133 mac { -# void TkGenWMDestroyEvent (Tk_Window tkwin) -#} -# -#declare 134 mac { -# void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ -# int width, int height, int flags) -#} - -declare 135 generic { - void TkpDrawHighlightBorder (Tk_Window tkwin, GC fgGC, GC bgGC, \ +declare 135 { + void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable) } - -declare 136 generic { - void TkSetFocusWin (TkWindow *winPtr, int force) +declare 136 { + void TkSetFocusWin(TkWindow *winPtr, int force) } - -declare 137 generic { - void TkpSetKeycodeAndState (Tk_Window tkwin, KeySym keySym, \ +declare 137 { + void TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym, XEvent *eventPtr) } - -declare 138 generic { - KeySym TkpGetKeySym (TkDisplay *dispPtr, XEvent *eventPtr) +declare 138 { + KeySym TkpGetKeySym(TkDisplay *dispPtr, XEvent *eventPtr) } - -declare 139 generic { - void TkpInitKeymapInfo (TkDisplay *dispPtr) +declare 139 { + void TkpInitKeymapInfo(TkDisplay *dispPtr) } - -declare 140 generic { - TkRegion TkPhotoGetValidRegion (Tk_PhotoHandle handle) +declare 140 { + TkRegion TkPhotoGetValidRegion(Tk_PhotoHandle handle) } - -declare 141 generic { - TkWindow ** TkWmStackorderToplevel(TkWindow *parentPtr) +declare 141 { + TkWindow **TkWmStackorderToplevel(TkWindow *parentPtr) } - -declare 142 generic { +declare 142 { void TkFocusFree(TkMainInfo *mainPtr) } - -declare 143 generic { +declare 143 { void TkClipCleanup(TkDisplay *dispPtr) } - -declare 144 generic { +declare 144 { void TkGCCleanup(TkDisplay *dispPtr) } - declare 145 {mac win aqua} { - void TkSubtractRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) + void TkSubtractRegion(TkRegion sra, TkRegion srcb, TkRegion dr_return) } - -declare 146 generic { - void TkStylePkgInit (TkMainInfo *mainPtr) +declare 146 { + void TkStylePkgInit(TkMainInfo *mainPtr) } -declare 147 generic { - void TkStylePkgFree (TkMainInfo *mainPtr) +declare 147 { + void TkStylePkgFree(TkMainInfo *mainPtr) } - -declare 148 generic { +declare 148 { Tk_Window TkToplevelWindowForCommand(Tcl_Interp *interp, - CONST char *cmdName) + const char *cmdName) } - -declare 149 generic { - CONST Tk_OptionSpec * TkGetOptionSpec (CONST char *name, - Tk_OptionTable optionTable) +declare 149 { + const Tk_OptionSpec *TkGetOptionSpec(const char *name, + Tk_OptionTable optionTable) } - -# TIP#168 - 8.5+ -#declare 150 generic { -# int TkMakeRawCurve (Tk_Canvas canvas, -# double *pointPtr, int numPoints, int numSteps, -# XPoint xPoints[], double dblPoints[]) -#} -#declare 151 generic { -# void TkMakeRawCurvePostscript (Tcl_Interp *interp, -# Tk_Canvas canvas, double *pointPtr, int numPoints) -#} - -declare 152 generic { +declare 152 { void TkpDrawFrame(Tk_Window tkwin, Tk_3DBorder border, - int highlightWidth, int borderWidth, int relief) + int highlightWidth, int borderWidth, int relief) } ############################################################################## @@ -699,200 +497,155 @@ declare 152 generic { interface tkIntPlat -######################### +################################ # Unix specific functions declare 0 x11 { - void TkCreateXEventSource (void) + void TkCreateXEventSource(void) } - declare 1 x11 { - void TkFreeWindowId (TkDisplay *dispPtr, Window w) + void TkFreeWindowId(TkDisplay *dispPtr, Window w) } - declare 2 x11 { - void TkInitXId (TkDisplay *dispPtr) + void TkInitXId(TkDisplay *dispPtr) } - declare 3 x11 { - int TkpCmapStressed (Tk_Window tkwin, Colormap colormap) + int TkpCmapStressed(Tk_Window tkwin, Colormap colormap) } - declare 4 x11 { - void TkpSync (Display *display) + void TkpSync(Display *display) } - declare 5 x11 { - Window TkUnixContainerId (TkWindow *winPtr) + Window TkUnixContainerId(TkWindow *winPtr) } - declare 6 x11 { - int TkUnixDoOneXEvent (Tcl_Time *timePtr) + int TkUnixDoOneXEvent(Tcl_Time *timePtr) } - declare 7 x11 { - void TkUnixSetMenubar (Tk_Window tkwin, Tk_Window menubar) + void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar) } - declare 8 x11 { - int TkpScanWindowId (Tcl_Interp *interp, CONST char *string, Window *idPtr) + int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr) } - declare 9 x11 { - void TkWmCleanup (TkDisplay *dispPtr) + void TkWmCleanup(TkDisplay *dispPtr) } - declare 10 x11 { - void TkSendCleanup (TkDisplay *dispPtr) + void TkSendCleanup(TkDisplay *dispPtr) } - declare 11 x11 { - void TkFreeXId (TkDisplay *dispPtr) + void TkFreeXId(TkDisplay *dispPtr) } - declare 12 x11 { - int TkpWmSetState (TkWindow *winPtr, int state) + int TkpWmSetState(TkWindow *winPtr, int state) } -############################ +################################ # Windows specific functions declare 0 win { - char * TkAlignImageData (XImage *image, int alignment, int bitOrder) + char *TkAlignImageData(XImage *image, int alignment, int bitOrder) } - declare 2 win { - void TkGenerateActivateEvents (TkWindow *winPtr, int active) + void TkGenerateActivateEvents(TkWindow *winPtr, int active) } - declare 3 win { - unsigned long TkpGetMS (void) + unsigned long TkpGetMS(void) } - declare 4 win { - void TkPointerDeadWindow (TkWindow *winPtr) + void TkPointerDeadWindow(TkWindow *winPtr) } - declare 5 win { - void TkpPrintWindowId (char *buf, Window window) + void TkpPrintWindowId(char *buf, Window window) } - declare 6 win { - int TkpScanWindowId (Tcl_Interp *interp, CONST char *string, Window *idPtr) + int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr) } - declare 7 win { - void TkpSetCapture (TkWindow *winPtr) + void TkpSetCapture(TkWindow *winPtr) } - declare 8 win { - void TkpSetCursor (TkpCursor cursor) + void TkpSetCursor(TkpCursor cursor) } - declare 9 win { - void TkpWmSetState (TkWindow *winPtr, int state) + void TkpWmSetState(TkWindow *winPtr, int state) } - declare 10 win { - void TkSetPixmapColormap (Pixmap pixmap, Colormap colormap) + void TkSetPixmapColormap(Pixmap pixmap, Colormap colormap) } - declare 11 win { - void TkWinCancelMouseTimer (void) + void TkWinCancelMouseTimer(void) } - declare 12 win { - void TkWinClipboardRender (TkDisplay *dispPtr, UINT format) + void TkWinClipboardRender(TkDisplay *dispPtr, UINT format) } - declare 13 win { - LRESULT TkWinEmbeddedEventProc (HWND hwnd, UINT message, \ + LRESULT TkWinEmbeddedEventProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) } - declare 14 win { - void TkWinFillRect (HDC dc, int x, int y, int width, int height, \ - int pixel) + void TkWinFillRect(HDC dc, int x, int y, int width, int height, int pixel) } - declare 15 win { - COLORREF TkWinGetBorderPixels (Tk_Window tkwin, Tk_3DBorder border, \ + COLORREF TkWinGetBorderPixels(Tk_Window tkwin, Tk_3DBorder border, int which) } - declare 16 win { - HDC TkWinGetDrawableDC (Display *display, Drawable d, TkWinDCState* state) + HDC TkWinGetDrawableDC(Display *display, Drawable d, TkWinDCState *state) } - declare 17 win { - int TkWinGetModifierState (void) + int TkWinGetModifierState(void) } - declare 18 win { - HPALETTE TkWinGetSystemPalette (void) + HPALETTE TkWinGetSystemPalette(void) } - declare 19 win { - HWND TkWinGetWrapperWindow (Tk_Window tkwin) + HWND TkWinGetWrapperWindow(Tk_Window tkwin) } - declare 20 win { - int TkWinHandleMenuEvent (HWND *phwnd, \ - UINT *pMessage, WPARAM *pwParam, LPARAM *plParam, \ - LRESULT *plResult) + int TkWinHandleMenuEvent(HWND *phwnd, UINT *pMessage, WPARAM *pwParam, + LPARAM *plParam, LRESULT *plResult) } - declare 21 win { - int TkWinIndexOfColor (XColor *colorPtr) + int TkWinIndexOfColor(XColor *colorPtr) } - declare 22 win { - void TkWinReleaseDrawableDC (Drawable d, HDC hdc, TkWinDCState* state) + void TkWinReleaseDrawableDC(Drawable d, HDC hdc, TkWinDCState *state) } - declare 23 win { - LRESULT TkWinResendEvent (WNDPROC wndproc, HWND hwnd, XEvent *eventPtr) + LRESULT TkWinResendEvent(WNDPROC wndproc, HWND hwnd, XEvent *eventPtr) } - declare 24 win { - HPALETTE TkWinSelectPalette (HDC dc, Colormap colormap) + HPALETTE TkWinSelectPalette(HDC dc, Colormap colormap) } - declare 25 win { - void TkWinSetMenu (Tk_Window tkwin, HMENU hMenu) + void TkWinSetMenu(Tk_Window tkwin, HMENU hMenu) } - declare 26 win { - void TkWinSetWindowPos (HWND hwnd, HWND siblingHwnd, int pos) + void TkWinSetWindowPos(HWND hwnd, HWND siblingHwnd, int pos) } - declare 27 win { - void TkWinWmCleanup (HINSTANCE hInstance) + void TkWinWmCleanup(HINSTANCE hInstance) } - declare 28 win { - void TkWinXCleanup (ClientData clientData) + void TkWinXCleanup(ClientData clientData) } - declare 29 win { - void TkWinXInit (HINSTANCE hInstance) + void TkWinXInit(HINSTANCE hInstance) } # new for 8.1 declare 30 win { - void TkWinSetForegroundWindow (TkWindow *winPtr) + void TkWinSetForegroundWindow(TkWindow *winPtr) } - declare 31 win { - void TkWinDialogDebug (int debug) + void TkWinDialogDebug(int debug) } - declare 32 win { - Tcl_Obj * TkWinGetMenuSystemDefault (Tk_Window tkwin, \ - CONST char *dbName, CONST char *className) + Tcl_Obj *TkWinGetMenuSystemDefault(Tk_Window tkwin, + const char *dbName, const char *className) } - declare 33 win { int TkWinGetPlatformId(void) } @@ -900,477 +653,375 @@ declare 33 win { # new for 8.4.1 declare 34 win { - void TkWinSetHINSTANCE (HINSTANCE hInstance) + void TkWinSetHINSTANCE(HINSTANCE hInstance) } -######################## +################################ # Mac specific functions declare 0 mac { - void TkGenerateActivateEvents (TkWindow *winPtr, int active) + void TkGenerateActivateEvents(TkWindow *winPtr, int active) } -# removed duplicates from tkInt table -#declare 1 mac { -# Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) -#} -# -#declare 2 mac { -# void TkpDefineNativeBitmaps (void) -#} - declare 3 mac { - unsigned long TkpGetMS (void) + unsigned long TkpGetMS(void) } - declare 5 mac { - void TkPointerDeadWindow (TkWindow *winPtr) + void TkPointerDeadWindow(TkWindow *winPtr) } - declare 6 mac { - void TkpSetCapture (TkWindow *winPtr) + void TkpSetCapture(TkWindow *winPtr) } - declare 7 mac { - void TkpSetCursor (TkpCursor cursor) + void TkpSetCursor(TkpCursor cursor) } - declare 8 mac { - void TkpWmSetState (TkWindow *winPtr, int state) + void TkpWmSetState(TkWindow *winPtr, int state) } - declare 10 mac { - void TkAboutDlg (void) + void TkAboutDlg(void) } - declare 13 mac { - Window TkGetTransientMaster (TkWindow *winPtr) + Window TkGetTransientMaster(TkWindow *winPtr) } - declare 14 mac { - int TkGenerateButtonEvent (int x, int y, \ + int TkGenerateButtonEvent(int x, int y, Window window, unsigned int state) } - declare 16 mac { - void TkGenWMDestroyEvent (Tk_Window tkwin) + void TkGenWMDestroyEvent(Tk_Window tkwin) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 17 mac { -# void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ +# void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, # int width, int height, int flags) #} - declare 18 mac { - unsigned int TkMacButtonKeyState (void) + unsigned int TkMacButtonKeyState(void) } - declare 19 mac { - void TkMacClearMenubarActive (void) + void TkMacClearMenubarActive(void) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 20 mac { -# int TkMacConvertEvent (EventRecord *eventPtr) +# int TkMacConvertEvent(EventRecord *eventPtr) #} - declare 21 mac { - int TkMacDispatchMenuEvent (int menuID, int index) + int TkMacDispatchMenuEvent(int menuID, int index) } - declare 22 mac { - void TkMacInstallCursor (int resizeOverride) + void TkMacInstallCursor(int resizeOverride) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 23 mac { -# int TkMacConvertTkEvent (EventRecord *eventPtr, Window window) +# int TkMacConvertTkEvent(EventRecord *eventPtr, Window window) #} - declare 24 mac { - void TkMacHandleTearoffMenu (void) + void TkMacHandleTearoffMenu(void) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 26 mac { -# void TkMacInvalClipRgns (TkWindow *winPtr) +# void TkMacInvalClipRgns(TkWindow *winPtr) #} - declare 27 mac { - void TkMacDoHLEvent (EventRecord *theEvent) + void TkMacDoHLEvent(EventRecord *theEvent) } - declare 29 mac { - Time TkMacGenerateTime (void) + Time TkMacGenerateTime(void) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 30 mac { -# GWorldPtr TkMacGetDrawablePort (Drawable drawable) +# GWorldPtr TkMacGetDrawablePort(Drawable drawable) #} - declare 31 mac { - TkWindow * TkMacGetScrollbarGrowWindow (TkWindow *winPtr) + TkWindow *TkMacGetScrollbarGrowWindow(TkWindow *winPtr) } - declare 32 mac { - Window TkMacGetXWindow (WindowRef macWinPtr) + Window TkMacGetXWindow(WindowRef macWinPtr) } - declare 33 mac { - int TkMacGrowToplevel (WindowRef whichWindow, Point start) + int TkMacGrowToplevel(WindowRef whichWindow, Point start) } - declare 34 mac { - void TkMacHandleMenuSelect (long mResult, int optionKeyPressed) + void TkMacHandleMenuSelect(long mResult, int optionKeyPressed) } - -# removed duplicates from tkPlat table (tk.decls) +# removed duplicates from tkPlat table(tk.decls) #declare 35 mac { -# int TkMacHaveAppearance (void) +# int TkMacHaveAppearance(void) #} # #declare 36 mac { -# void TkMacInitAppleEvents (Tcl_Interp *interp) +# void TkMacInitAppleEvents(Tcl_Interp *interp) #} # #declare 37 mac { -# void TkMacInitMenus (Tcl_Interp *interp) +# void TkMacInitMenus(Tcl_Interp *interp) #} - declare 38 mac { - void TkMacInvalidateWindow (MacDrawable *macWin, int flag) + void TkMacInvalidateWindow(MacDrawable *macWin, int flag) } - declare 39 mac { - int TkMacIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar) + int TkMacIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar) } - declare 40 mac { - void TkMacMakeRealWindowExist (TkWindow *winPtr) + void TkMacMakeRealWindowExist(TkWindow *winPtr) } - declare 41 mac { BitMapPtr TkMacMakeStippleMap(Drawable d1, Drawable d2) } - declare 42 mac { - void TkMacMenuClick (void) + void TkMacMenuClick(void) } - declare 43 mac { - void TkMacRegisterOffScreenWindow (Window window, GWorldPtr portPtr) + void TkMacRegisterOffScreenWindow(Window window, GWorldPtr portPtr) } - declare 44 mac { - int TkMacResizable (TkWindow *winPtr) + int TkMacResizable(TkWindow *winPtr) } - declare 46 mac { - void TkMacSetHelpMenuItemCount (void) + void TkMacSetHelpMenuItemCount(void) } - declare 47 mac { - void TkMacSetScrollbarGrow (TkWindow *winPtr, int flag) + void TkMacSetScrollbarGrow(TkWindow *winPtr, int flag) } - declare 48 mac { - void TkMacSetUpClippingRgn (Drawable drawable) + void TkMacSetUpClippingRgn(Drawable drawable) } - declare 49 mac { - void TkMacSetUpGraphicsPort (GC gc) + void TkMacSetUpGraphicsPort(GC gc) } - declare 50 mac { - void TkMacUpdateClipRgn (TkWindow *winPtr) + void TkMacUpdateClipRgn(TkWindow *winPtr) } - declare 51 mac { - void TkMacUnregisterMacWindow (GWorldPtr portPtr) + void TkMacUnregisterMacWindow(GWorldPtr portPtr) } - declare 52 mac { - int TkMacUseMenuID (short macID) + int TkMacUseMenuID(short macID) } - declare 53 mac { - RgnHandle TkMacVisableClipRgn (TkWindow *winPtr) + RgnHandle TkMacVisableClipRgn(TkWindow *winPtr) } - declare 54 mac { - void TkMacWinBounds (TkWindow *winPtr, Rect *geometry) + void TkMacWinBounds(TkWindow *winPtr, Rect *geometry) } - declare 55 mac { - void TkMacWindowOffset (WindowRef wRef, int *xOffset, int *yOffset) + void TkMacWindowOffset(WindowRef wRef, int *xOffset, int *yOffset) } - declare 57 mac { - int TkSetMacColor (unsigned long pixel, RGBColor *macColor) + int TkSetMacColor(unsigned long pixel, RGBColor *macColor) } - declare 58 mac { - void TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid) + void TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid) } - declare 59 mac { - void TkSuspendClipboard (void) + void TkSuspendClipboard(void) } - declare 61 mac { - int TkMacZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart) + int TkMacZoomToplevel(WindowPtr whichWindow, Point where, short zoomPart) } - declare 62 mac { - Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \ + Tk_Window Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX, int rootY, int *newX, int *newY) } - declare 63 mac { - MacDrawable * TkMacContainerId (TkWindow *winPtr) + MacDrawable *TkMacContainerId(TkWindow *winPtr) } - declare 64 mac { - MacDrawable * TkMacGetHostToplevel (TkWindow *winPtr) + MacDrawable *TkMacGetHostToplevel(TkWindow *winPtr) } - declare 65 mac { - void TkMacPreprocessMenu (void) + void TkMacPreprocessMenu(void) } - declare 66 mac { - int TkpIsWindowFloating (WindowRef window) + int TkpIsWindowFloating(WindowRef window) } - declare 35 win { - int TkWinGetPlatformTheme (void) + int TkWinGetPlatformTheme(void) } - -######################## -# Mac OS X specific functions +################################ +# Aqua specific functions declare 0 aqua { - void TkGenerateActivateEvents (TkWindow *winPtr, int active) + void TkGenerateActivateEvents(TkWindow *winPtr, int active) } # removed duplicates from tkInt table #declare 1 aqua { -# Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) +# Pixmap TkpCreateNativeBitmap(Display *display, const char *source) #} # #declare 2 aqua { -# void TkpDefineNativeBitmaps (void) +# void TkpDefineNativeBitmaps(void) #} declare 3 aqua { - void TkPointerDeadWindow (TkWindow *winPtr) + void TkPointerDeadWindow(TkWindow *winPtr) } - declare 4 aqua { - void TkpSetCapture (TkWindow *winPtr) + void TkpSetCapture(TkWindow *winPtr) } - declare 5 aqua { - void TkpSetCursor (TkpCursor cursor) + void TkpSetCursor(TkpCursor cursor) } - declare 6 aqua { - void TkpWmSetState (TkWindow *winPtr, int state) + void TkpWmSetState(TkWindow *winPtr, int state) } - declare 7 aqua { - void TkAboutDlg (void) + void TkAboutDlg(void) } - declare 8 aqua { - unsigned int TkMacOSXButtonKeyState (void) + unsigned int TkMacOSXButtonKeyState(void) } - declare 9 aqua { - void TkMacOSXClearMenubarActive (void) + void TkMacOSXClearMenubarActive(void) } - declare 10 aqua { - int TkMacOSXDispatchMenuEvent (int menuID, int index) + int TkMacOSXDispatchMenuEvent(int menuID, int index) } - declare 11 aqua { - void TkMacOSXInstallCursor (int resizeOverride) + void TkMacOSXInstallCursor(int resizeOverride) } - declare 12 aqua { - void TkMacOSXHandleTearoffMenu (void) + void TkMacOSXHandleTearoffMenu(void) } -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 13 aqua { -# void TkMacOSXInvalClipRgns (TkWindow *winPtr) +# void TkMacOSXInvalClipRgns(TkWindow *winPtr) #} declare 14 aqua { - int TkMacOSXDoHLEvent (EventRecord *theEvent) + int TkMacOSXDoHLEvent(EventRecord *theEvent) } -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 15 aqua { -# GWorldPtr TkMacOSXGetDrawablePort (Drawable drawable) +# GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable) #} declare 16 aqua { - Window TkMacOSXGetXWindow (WindowRef macWinPtr) + Window TkMacOSXGetXWindow(WindowRef macWinPtr) } - declare 17 aqua { - int TkMacOSXGrowToplevel (WindowRef whichWindow, Point start) + int TkMacOSXGrowToplevel(WindowRef whichWindow, Point start) } - declare 18 aqua { - void TkMacOSXHandleMenuSelect(MenuID theMenu, MenuItemIndex theItem, int optionKeyPressed) + void TkMacOSXHandleMenuSelect(MenuID theMenu, MenuItemIndex theItem, + int optionKeyPressed) } -# removed duplicates from tkPlat table (tk.decls) +# removed duplicates from tkPlat table(tk.decls) #declare 19 aqua { -# void TkMacOSXInitAppleEvents (Tcl_Interp *interp) +# void TkMacOSXInitAppleEvents(Tcl_Interp *interp) #} # #declare 20 aqua { -# void TkMacOSXInitMenus (Tcl_Interp *interp) +# void TkMacOSXInitMenus(Tcl_Interp *interp) #} declare 21 aqua { - void TkMacOSXInvalidateWindow (MacDrawable *macWin, int flag) + void TkMacOSXInvalidateWindow(MacDrawable *macWin, int flag) } - declare 22 aqua { - int TkMacOSXIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar) + int TkMacOSXIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar) } - declare 23 aqua { - void TkMacOSXMakeRealWindowExist (TkWindow *winPtr) + void TkMacOSXMakeRealWindowExist(TkWindow *winPtr) } - declare 24 aqua { BitMapPtr TkMacOSXMakeStippleMap(Drawable d1, Drawable d2) } - declare 25 aqua { - void TkMacOSXMenuClick (void) + void TkMacOSXMenuClick(void) } - declare 26 aqua { - void TkMacOSXRegisterOffScreenWindow (Window window, GWorldPtr portPtr) + void TkMacOSXRegisterOffScreenWindow(Window window, GWorldPtr portPtr) } - declare 27 aqua { - int TkMacOSXResizable (TkWindow *winPtr) + int TkMacOSXResizable(TkWindow *winPtr) } - declare 28 aqua { - void TkMacOSXSetHelpMenuItemCount (void) + void TkMacOSXSetHelpMenuItemCount(void) } - declare 29 aqua { - void TkMacOSXSetScrollbarGrow (TkWindow *winPtr, int flag) + void TkMacOSXSetScrollbarGrow(TkWindow *winPtr, int flag) } - declare 30 aqua { - void TkMacOSXSetUpClippingRgn (Drawable drawable) + void TkMacOSXSetUpClippingRgn(Drawable drawable) } - declare 31 aqua { - void TkMacOSXSetUpGraphicsPort (GC gc, GWorldPtr destPort) + void TkMacOSXSetUpGraphicsPort(GC gc, GWorldPtr destPort) } - declare 32 aqua { - void TkMacOSXUpdateClipRgn (TkWindow *winPtr) + void TkMacOSXUpdateClipRgn(TkWindow *winPtr) } - declare 33 aqua { - void TkMacOSXUnregisterMacWindow (WindowRef portPtr) + void TkMacOSXUnregisterMacWindow(WindowRef portPtr) } - declare 34 aqua { - int TkMacOSXUseMenuID (short macID) + int TkMacOSXUseMenuID(short macID) } - declare 35 aqua { - RgnHandle TkMacOSXVisableClipRgn (TkWindow *winPtr) + RgnHandle TkMacOSXVisableClipRgn(TkWindow *winPtr) } - declare 36 aqua { - void TkMacOSXWinBounds (TkWindow *winPtr, Rect *geometry) + void TkMacOSXWinBounds(TkWindow *winPtr, Rect *geometry) } - declare 37 aqua { - void TkMacOSXWindowOffset (WindowRef wRef, int *xOffset, int *yOffset) + void TkMacOSXWindowOffset(WindowRef wRef, int *xOffset, int *yOffset) } - declare 38 aqua { - int TkSetMacColor (unsigned long pixel, RGBColor *macColor) + int TkSetMacColor(unsigned long pixel, RGBColor *macColor) } - declare 39 aqua { - void TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid) + void TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid) } - declare 40 aqua { - void TkSuspendClipboard (void) + void TkSuspendClipboard(void) } - declare 41 aqua { - int TkMacOSXZoomToplevel (WindowPtr whichWindow, short zoomPart) + int TkMacOSXZoomToplevel(WindowPtr whichWindow, short zoomPart) } - declare 42 aqua { - Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \ - int rootX, int rootY, int *newX, int *newY) + Tk_Window Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX, int rootY, + int *newX, int *newY) } - declare 43 aqua { - MacDrawable * TkMacOSXContainerId (TkWindow *winPtr) + MacDrawable *TkMacOSXContainerId(TkWindow *winPtr) } - declare 44 aqua { - MacDrawable * TkMacOSXGetHostToplevel (TkWindow *winPtr) + MacDrawable *TkMacOSXGetHostToplevel(TkWindow *winPtr) } - declare 45 aqua { - void TkMacOSXPreprocessMenu (void) + void TkMacOSXPreprocessMenu(void) } - declare 46 aqua { - int TkpIsWindowFloating (WindowRef window) + int TkpIsWindowFloating(WindowRef window) } - declare 47 aqua { - Tk_Window TkMacOSXGetCapture (void) + Tk_Window TkMacOSXGetCapture(void) } - declare 49 aqua { - Window TkGetTransientMaster (TkWindow *winPtr) + Window TkGetTransientMaster(TkWindow *winPtr) } - declare 50 aqua { - int TkGenerateButtonEvent (int x, int y, \ - Window window, unsigned int state) + int TkGenerateButtonEvent(int x, int y, Window window, unsigned int state) } - declare 51 aqua { - void TkGenWMDestroyEvent (Tk_Window tkwin) + void TkGenWMDestroyEvent(Tk_Window tkwin) } # removed duplicate from tkPlat table (tk.decls) #declare 52 aqua { -# void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ +# void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, # int width, int height, int flags) #} declare 53 aqua { - unsigned long TkpGetMS (void) + unsigned long TkpGetMS(void) } - + ############################################################################## # Define the platform specific internal Xlib interfaces. These functions are @@ -1378,899 +1029,703 @@ declare 53 aqua { interface tkIntXlib +################################ # X functions for Windows declare 0 win { - void XSetDashes (Display* display, GC gc, int dash_offset, - _Xconst char* dash_list, int n) + void XSetDashes(Display *display, GC gc, int dash_offset, + _Xconst char *dash_list, int n) } - declare 1 win { - XModifierKeymap* XGetModifierMapping (Display* d) + XModifierKeymap *XGetModifierMapping(Display *d) } - declare 2 win { - XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \ - int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \ + XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, + int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4) - } - declare 3 win { - XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \ + XImage *XGetImage(Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } - declare 4 win { - char *XGetAtomName (Display* d,Atom a) - + char *XGetAtomName(Display *d, Atom a) } - declare 5 win { - char *XKeysymToString (KeySym k) + char *XKeysymToString(KeySym k) } - declare 6 win { - Colormap XCreateColormap (Display* d, Window w, Visual* v, int i) - + Colormap XCreateColormap(Display *d, Window w, Visual *v, int i) } - declare 7 win { - Cursor XCreatePixmapCursor (Display* d, Pixmap p1, Pixmap p2, \ - XColor* x1, XColor* x2, \ - unsigned int ui1, unsigned int ui2) + Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, + XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2) } - declare 8 win { - Cursor XCreateGlyphCursor (Display* d, Font f1, Font f2, \ - unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2) + Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, + unsigned int ui1, unsigned int ui2, XColor *x1, XColor *x2) } - declare 9 win { - GContext XGContextFromGC (GC g) + GContext XGContextFromGC(GC g) } - declare 10 win { - XHostAddress *XListHosts (Display* d, int* i, Bool* b) + XHostAddress *XListHosts(Display *d, int *i, Bool *b) } - # second parameter was of type KeyCode declare 11 win { - KeySym XKeycodeToKeysym (Display* d, unsigned int k, int i) + KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i) } - declare 12 win { - KeySym XStringToKeysym (_Xconst char* c) + KeySym XStringToKeysym(_Xconst char *c) } - declare 13 win { - Window XRootWindow (Display* d, int i) + Window XRootWindow(Display *d, int i) } - declare 14 win { - XErrorHandler XSetErrorHandler (XErrorHandler x) + XErrorHandler XSetErrorHandler(XErrorHandler x) } - declare 15 win { - Status XIconifyWindow (Display* d, Window w, int i) + Status XIconifyWindow(Display *d, Window w, int i) } - declare 16 win { - Status XWithdrawWindow (Display* d, Window w, int i) + Status XWithdrawWindow(Display *d, Window w, int i) } - declare 17 win { - Status XGetWMColormapWindows (Display* d, Window w, Window** wpp, int* ip) + Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip) } - declare 18 win { - Status XAllocColor (Display* d, Colormap c, XColor* xp) + Status XAllocColor(Display *d, Colormap c, XColor *xp) } - declare 19 win { - void XBell (Display* d, int i) + void XBell(Display *d, int i) } - declare 20 win { - void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \ - int i2, _Xconst unsigned char* c, int i3) + void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, + int i2, _Xconst unsigned char *c, int i3) } - declare 21 win { - void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \ - XSetWindowAttributes* x) + void XChangeWindowAttributes(Display *d, Window w, unsigned long ul, + XSetWindowAttributes *x) } - declare 22 win { - void XClearWindow (Display* d, Window w) + void XClearWindow(Display *d, Window w) } - declare 23 win { - void XConfigureWindow (Display* d, Window w, unsigned int i, \ - XWindowChanges* x) + void XConfigureWindow(Display *d, Window w, unsigned int i, + XWindowChanges *x) } - declare 24 win { - void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ - int i2, unsigned int ui1, \ - unsigned int ui2, int i3, int i4) + void XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, + int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 25 win { - void XCopyPlane (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ - int i2, unsigned int ui1, \ + void XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, + int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul) } - declare 26 win { - Pixmap XCreateBitmapFromData(Display* display, Drawable d, \ - _Xconst char* data, unsigned int width,unsigned int height) + Pixmap XCreateBitmapFromData(Display *display, Drawable d, + _Xconst char *data, unsigned int width, unsigned int height) } - declare 27 win { - void XDefineCursor (Display* d, Window w, Cursor c) + void XDefineCursor(Display *d, Window w, Cursor c) } - declare 28 win { - void XDeleteProperty (Display* d, Window w, Atom a) + void XDeleteProperty(Display *d, Window w, Atom a) } - declare 29 win { - void XDestroyWindow (Display* d, Window w) + void XDestroyWindow(Display *d, Window w) } - declare 30 win { - void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \ + void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 31 win { - void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2) + void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) } - declare 32 win { - void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\ + void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2) } - declare 33 win { - void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \ + void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 34 win { - void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \ + void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3) } - declare 35 win { - void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i) + void XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) } - declare 36 win { - void XForceScreenSaver (Display* d, int i) + void XForceScreenSaver(Display *d, int i) } - declare 37 win { - void XFreeColormap (Display* d, Colormap c) + void XFreeColormap(Display *d, Colormap c) } - declare 38 win { - void XFreeColors (Display* d, Colormap c, \ - unsigned long* ulp, int i, unsigned long ul) + void XFreeColors(Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul) } - declare 39 win { - void XFreeCursor (Display* d, Cursor c) + void XFreeCursor(Display *d, Cursor c) } - declare 40 win { - void XFreeModifiermap (XModifierKeymap* x) + void XFreeModifiermap(XModifierKeymap *x) } - declare 41 win { - Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \ - int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \ - unsigned int* ui4) + Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, + int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, + unsigned int *ui4) } - declare 42 win { - void XGetInputFocus (Display* d, Window* w, int* i) + void XGetInputFocus(Display *d, Window *w, int *i) } - declare 43 win { - int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \ - Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \ - unsigned long* ulp2, unsigned char** cpp) + int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, + Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp) } - declare 44 win { - Status XGetWindowAttributes (Display* d, Window w, XWindowAttributes* x) + Status XGetWindowAttributes(Display *d, Window w, XWindowAttributes *x) } - declare 45 win { - int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t) + int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t) } - declare 46 win { - int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \ + int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t) } - declare 47 win { - KeyCode XKeysymToKeycode (Display* d, KeySym k) + KeyCode XKeysymToKeycode(Display *d, KeySym k) } - declare 48 win { - Status XLookupColor (Display* d, Colormap c1, _Xconst char* c2, \ - XColor* x1, XColor* x2) + Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2, + XColor *x1, XColor *x2) } - declare 49 win { - void XMapWindow (Display* d, Window w) + void XMapWindow(Display *d, Window w) } - declare 50 win { - void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \ + void XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2) } - declare 51 win { - void XMoveWindow (Display* d, Window w, int i1, int i2) + void XMoveWindow(Display *d, Window w, int i1, int i2) } - declare 52 win { - void XNextEvent (Display* d, XEvent* x) + void XNextEvent(Display *d, XEvent *x) } - declare 53 win { - void XPutBackEvent (Display* d, XEvent* x) + void XPutBackEvent(Display *d, XEvent *x) } - declare 54 win { - void XQueryColors (Display* d, Colormap c, XColor* x, int i) + void XQueryColors(Display *d, Colormap c, XColor *x, int i) } - declare 55 win { - Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \ - int* i1, int* i2, int* i3, int* i4, unsigned int* ui) + Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, + int *i1, int *i2, int *i3, int *i4, unsigned int *ui) } - declare 56 win { - Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \ - Window** w4, unsigned int* ui) + Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, + Window **w4, unsigned int *ui) } - declare 57 win { - void XRaiseWindow (Display* d, Window w) + void XRaiseWindow(Display *d, Window w) } - declare 58 win { - void XRefreshKeyboardMapping (XMappingEvent* x) + void XRefreshKeyboardMapping(XMappingEvent *x) } - declare 59 win { - void XResizeWindow (Display* d, Window w, unsigned int ui1, \ + void XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2) } - declare 60 win { - void XSelectInput (Display* d, Window w, long l) + void XSelectInput(Display *d, Window w, long l) } - declare 61 win { - Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x) + Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x) } - declare 62 win { - void XSetCommand (Display* d, Window w, CONST char** c, int i) + void XSetCommand(Display *d, Window w, const char **c, int i) } - declare 63 win { - void XSetIconName (Display* d, Window w, _Xconst char* c) + void XSetIconName(Display *d, Window w, _Xconst char *c) } - declare 64 win { - void XSetInputFocus (Display* d, Window w, int i, Time t) + void XSetInputFocus(Display *d, Window w, int i, Time t) } - declare 65 win { - void XSetSelectionOwner (Display* d, Atom a, Window w, Time t) + void XSetSelectionOwner(Display *d, Atom a, Window w, Time t) } - declare 66 win { - void XSetWindowBackground (Display* d, Window w, unsigned long ul) + void XSetWindowBackground(Display *d, Window w, unsigned long ul) } - declare 67 win { - void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p) + void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) } - declare 68 win { - void XSetWindowBorder (Display* d, Window w, unsigned long ul) + void XSetWindowBorder(Display *d, Window w, unsigned long ul) } - declare 69 win { - void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p) + void XSetWindowBorderPixmap(Display *d, Window w, Pixmap p) } - declare 70 win { - void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui) + void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui) } - declare 71 win { - void XSetWindowColormap (Display* d, Window w, Colormap c) + void XSetWindowColormap(Display *d, Window w, Colormap c) } - declare 72 win { - Bool XTranslateCoordinates (Display* d, Window w1, Window w2, int i1,\ - int i2, int* i3, int* i4, Window* w3) + Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1, + int i2, int *i3, int *i4, Window *w3) } - declare 73 win { - void XUngrabKeyboard (Display* d, Time t) + void XUngrabKeyboard(Display *d, Time t) } - declare 74 win { - void XUngrabPointer (Display* d, Time t) + void XUngrabPointer(Display *d, Time t) } - declare 75 win { - void XUnmapWindow (Display* d, Window w) + void XUnmapWindow(Display *d, Window w) } - declare 76 win { - void XWindowEvent (Display* d, Window w, long l, XEvent* x) + void XWindowEvent(Display *d, Window w, long l, XEvent *x) } - declare 77 win { - void XDestroyIC (XIC x) + void XDestroyIC(XIC x) } - declare 78 win { - Bool XFilterEvent (XEvent* x, Window w) + Bool XFilterEvent(XEvent *x, Window w) } - declare 79 win { - int XmbLookupString (XIC xi, XKeyPressedEvent* xk, \ - char* c, int i, KeySym* k, Status* s) + int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i, + KeySym *k, Status *s) } - declare 80 win { - void TkPutImage (unsigned long *colors, \ - int ncolors, Display* display, Drawable d, \ - GC gc, XImage* image, int src_x, int src_y, \ - int dest_x, int dest_y, unsigned int width, \ - unsigned int height) + void TkPutImage(unsigned long *colors, int ncolors, Display *display, + Drawable d, GC gc, XImage *image, int src_x, int src_y, + int dest_x, int dest_y, unsigned int width, unsigned int height) } # This slot is reserved for use by the clipping rectangle patch: # declare 81 win { -# XSetClipRectangles(Display *display, GC gc, int clip_x_origin, \ +# XSetClipRectangles(Display *display, GC gc, int clip_x_origin, # int clip_y_origin, XRectangle rectangles[], int n, int ordering) # } declare 82 win { - Status XParseColor (Display *display, Colormap map, \ - _Xconst char* spec, XColor *colorPtr) + Status XParseColor(Display *display, Colormap map, + _Xconst char *spec, XColor *colorPtr) } - declare 83 win { - GC XCreateGC(Display* display, Drawable d, \ - unsigned long valuemask, XGCValues* values) + GC XCreateGC(Display *display, Drawable d, + unsigned long valuemask, XGCValues *values) } - declare 84 win { - void XFreeGC(Display* display, GC gc) + void XFreeGC(Display *display, GC gc) } - declare 85 win { - Atom XInternAtom(Display* display,_Xconst char* atom_name, \ + Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists) } - declare 86 win { - void XSetBackground(Display* display, GC gc, \ - unsigned long foreground) + void XSetBackground(Display *display, GC gc, unsigned long foreground) } - declare 87 win { - void XSetForeground(Display* display, GC gc, \ - unsigned long foreground) + void XSetForeground(Display *display, GC gc, unsigned long foreground) } - declare 88 win { - void XSetClipMask(Display* display, GC gc, Pixmap pixmap) + void XSetClipMask(Display *display, GC gc, Pixmap pixmap) } - declare 89 win { - void XSetClipOrigin(Display* display, GC gc, \ + void XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin) } - declare 90 win { - void XSetTSOrigin(Display* display, GC gc, \ + void XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin) } - declare 91 win { - void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values) + void XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) } - declare 92 win { void XSetFont(Display *display, GC gc, Font font) } - declare 93 win { void XSetArcMode(Display *display, GC gc, int arc_mode) } - declare 94 win { void XSetStipple(Display *display, GC gc, Pixmap stipple) } - declare 95 win { void XSetFillRule(Display *display, GC gc, int fill_rule) } - declare 96 win { void XSetFillStyle(Display *display, GC gc, int fill_style) } - declare 97 win { void XSetFunction(Display *display, GC gc, int function) } - declare 98 win { - void XSetLineAttributes(Display *display, GC gc, \ - unsigned int line_width, int line_style, \ - int cap_style, int join_style) + void XSetLineAttributes(Display *display, GC gc, unsigned int line_width, + int line_style, int cap_style, int join_style) } - declare 99 win { int _XInitImageFuncPtrs(XImage *image) } - declare 100 win { XIC XCreateIC(void) } - declare 101 win { - XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \ - XVisualInfo* vinfo_template, int* nitems_return) + XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, + XVisualInfo *vinfo_template, int *nitems_return) } - declare 102 win { - void XSetWMClientMachine(Display* display, Window w, XTextProperty* text_prop) + void XSetWMClientMachine(Display *display, Window w, + XTextProperty *text_prop) } - declare 103 win { - Status XStringListToTextProperty(char** list, int count, \ - XTextProperty* text_prop_return) + Status XStringListToTextProperty(char **list, int count, + XTextProperty *text_prop_return) } declare 104 win { - void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \ + void XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2) } declare 106 win { - void XFillRectangle (Display* display, Drawable d, GC gc, \ + void XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) } declare 105 win { - void XWarpPointer (Display* d, Window s, Window dw, int sx, int sy, \ + void XWarpPointer(Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy) } +################################ # X functions for Mac and Aqua declare 0 {mac aqua} { - void XSetDashes (Display* display, GC gc, int dash_offset, - _Xconst char* dash_list, int n) + void XSetDashes(Display *display, GC gc, int dash_offset, + _Xconst char *dash_list, int n) } - declare 1 {mac aqua} { - XModifierKeymap* XGetModifierMapping (Display* d) + XModifierKeymap *XGetModifierMapping(Display *d) } - declare 2 {mac aqua} { - XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \ - int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \ + XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, + int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4) - } - declare 3 {mac aqua} { - XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \ + XImage *XGetImage(Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } - declare 4 {mac aqua} { - char *XGetAtomName (Display* d,Atom a) - + char *XGetAtomName(Display *d, Atom a) } - declare 5 {mac aqua} { - char *XKeysymToString (KeySym k) + char *XKeysymToString(KeySym k) } - declare 6 {mac aqua} { - Colormap XCreateColormap (Display* d, Window w, Visual* v, int i) - + Colormap XCreateColormap(Display *d, Window w, Visual *v, int i) } - declare 7 {mac aqua} { - GContext XGContextFromGC (GC g) + GContext XGContextFromGC(GC g) } - declare 8 {mac aqua} { - KeySym XKeycodeToKeysym (Display* d, KeyCode k, int i) + KeySym XKeycodeToKeysym(Display *d, KeyCode k, int i) } - declare 9 {mac aqua} { - KeySym XStringToKeysym (_Xconst char* c) + KeySym XStringToKeysym(_Xconst char *c) } - declare 10 {mac aqua} { - Window XRootWindow (Display* d, int i) + Window XRootWindow(Display *d, int i) } - declare 11 {mac aqua} { - XErrorHandler XSetErrorHandler (XErrorHandler x) + XErrorHandler XSetErrorHandler(XErrorHandler x) } - declare 12 {mac aqua} { - Status XAllocColor (Display* d, Colormap c, XColor* xp) + Status XAllocColor(Display *d, Colormap c, XColor *xp) } - declare 13 {mac aqua} { - void XBell (Display* d, int i) + void XBell(Display *d, int i) } - declare 14 {mac aqua} { - void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \ - int i2, _Xconst unsigned char* c, int i3) + void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, + int i2, _Xconst unsigned char *c, int i3) } - declare 15 {mac aqua} { - void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \ - XSetWindowAttributes* x) + void XChangeWindowAttributes(Display *d, Window w, unsigned long ul, + XSetWindowAttributes *x) } - declare 16 {mac aqua} { - void XConfigureWindow (Display* d, Window w, unsigned int i, \ - XWindowChanges* x) + void XConfigureWindow(Display *d, Window w, unsigned int i, + XWindowChanges *x) } - declare 17 {mac aqua} { - void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ - int i2, unsigned int ui1, \ - unsigned int ui2, int i3, int i4) + void XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, + int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 18 {mac aqua} { - void XCopyPlane (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ - int i2, unsigned int ui1, \ + void XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, + int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul) } - declare 19 {mac aqua} { - Pixmap XCreateBitmapFromData(Display* display, Drawable d, \ - _Xconst char* data, unsigned int width,unsigned int height) + Pixmap XCreateBitmapFromData(Display *display, Drawable d, + _Xconst char *data, unsigned int width, unsigned int height) } - declare 20 {mac aqua} { - void XDefineCursor (Display* d, Window w, Cursor c) + void XDefineCursor(Display *d, Window w, Cursor c) } - declare 21 {mac aqua} { - void XDestroyWindow (Display* d, Window w) + void XDestroyWindow(Display *d, Window w) } - declare 22 {mac aqua} { - void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \ + void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 23 {mac aqua} { - void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2) + void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) } - declare 24 {mac aqua} { - void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\ + void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2) } - declare 25 {mac aqua} { - void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \ + void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 26 {mac aqua} { - void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \ + void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3) } - declare 27 {mac aqua} { - void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i) + void XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) } - declare 28 {mac aqua} { - void XFreeColormap (Display* d, Colormap c) + void XFreeColormap(Display *d, Colormap c) } - declare 29 {mac aqua} { - void XFreeColors (Display* d, Colormap c, \ - unsigned long* ulp, int i, unsigned long ul) + void XFreeColors(Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul) } - declare 30 {mac aqua} { - void XFreeModifiermap (XModifierKeymap* x) + void XFreeModifiermap(XModifierKeymap *x) } - declare 31 {mac aqua} { - Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \ - int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \ - unsigned int* ui4) + Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, + int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, + unsigned int *ui4) } - declare 32 {mac aqua} { - int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \ - Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \ - unsigned long* ulp2, unsigned char** cpp) + int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, + Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp) } - declare 33 {mac aqua} { - int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t) + int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t) } - declare 34 {mac aqua} { - int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \ + int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t) } - declare 35 {mac aqua} { - KeyCode XKeysymToKeycode (Display* d, KeySym k) + KeyCode XKeysymToKeycode(Display *d, KeySym k) } - declare 36 {mac aqua} { - void XMapWindow (Display* d, Window w) + void XMapWindow(Display *d, Window w) } - declare 37 {mac aqua} { - void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \ + void XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2) } - declare 38 {mac aqua} { - void XMoveWindow (Display* d, Window w, int i1, int i2) + void XMoveWindow(Display *d, Window w, int i1, int i2) } - declare 39 {mac aqua} { - Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \ - int* i1, int* i2, int* i3, int* i4, unsigned int* ui) + Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, + int *i1, int *i2, int *i3, int *i4, unsigned int *ui) } - declare 40 {mac aqua} { - void XRaiseWindow (Display* d, Window w) + void XRaiseWindow(Display *d, Window w) } - declare 41 {mac aqua} { - void XRefreshKeyboardMapping (XMappingEvent* x) + void XRefreshKeyboardMapping(XMappingEvent *x) } - declare 42 {mac aqua} { - void XResizeWindow (Display* d, Window w, unsigned int ui1, \ + void XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2) } - declare 43 {mac aqua} { - void XSelectInput (Display* d, Window w, long l) + void XSelectInput(Display *d, Window w, long l) } - declare 44 {mac aqua} { - Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x) + Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x) } - declare 45 {mac aqua} { - void XSetIconName (Display* d, Window w, _Xconst char* c) + void XSetIconName(Display *d, Window w, _Xconst char *c) } - declare 46 {mac aqua} { - void XSetInputFocus (Display* d, Window w, int i, Time t) + void XSetInputFocus(Display *d, Window w, int i, Time t) } - declare 47 {mac aqua} { - void XSetSelectionOwner (Display* d, Atom a, Window w, Time t) + void XSetSelectionOwner(Display *d, Atom a, Window w, Time t) } - declare 48 {mac aqua} { - void XSetWindowBackground (Display* d, Window w, unsigned long ul) + void XSetWindowBackground(Display *d, Window w, unsigned long ul) } - declare 49 {mac aqua} { - void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p) + void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) } - declare 50 {mac aqua} { - void XSetWindowBorder (Display* d, Window w, unsigned long ul) + void XSetWindowBorder(Display *d, Window w, unsigned long ul) } - declare 51 {mac aqua} { - void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p) + void XSetWindowBorderPixmap(Display *d, Window w, Pixmap p) } - declare 52 {mac aqua} { - void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui) + void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui) } - declare 53 {mac aqua} { - void XSetWindowColormap (Display* d, Window w, Colormap c) + void XSetWindowColormap(Display *d, Window w, Colormap c) } - declare 54 {mac aqua} { - void XUngrabKeyboard (Display* d, Time t) + void XUngrabKeyboard(Display *d, Time t) } - declare 55 {mac aqua} { - void XUngrabPointer (Display* d, Time t) + void XUngrabPointer(Display *d, Time t) } - declare 56 {mac aqua} { - void XUnmapWindow (Display* d, Window w) + void XUnmapWindow(Display *d, Window w) } - declare 57 {mac aqua} { - void TkPutImage (unsigned long *colors, \ - int ncolors, Display* display, Drawable d, \ - GC gc, XImage* image, int src_x, int src_y, \ - int dest_x, int dest_y, unsigned int width, \ - unsigned int height) -} + void TkPutImage(unsigned long *colors, int ncolors, Display *display, + Drawable d, GC gc, XImage *image, int src_x, int src_y, + int dest_x, int dest_y, unsigned int width, unsigned int height) +} declare 58 {mac aqua} { - Status XParseColor (Display *display, Colormap map, \ - _Xconst char* spec, XColor *colorPtr) + Status XParseColor(Display *display, Colormap map, + _Xconst char *spec, XColor *colorPtr) } - declare 59 {mac aqua} { - GC XCreateGC(Display* display, Drawable d, \ - unsigned long valuemask, XGCValues* values) + GC XCreateGC(Display *display, Drawable d, + unsigned long valuemask, XGCValues *values) } - declare 60 {mac aqua} { - void XFreeGC(Display* display, GC gc) + void XFreeGC(Display *display, GC gc) } - declare 61 {mac aqua} { - Atom XInternAtom(Display* display,_Xconst char* atom_name, \ + Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists) } - declare 62 {mac aqua} { - void XSetBackground(Display* display, GC gc, \ - unsigned long foreground) + void XSetBackground(Display *display, GC gc, unsigned long foreground) } - declare 63 {mac aqua} { - void XSetForeground(Display* display, GC gc, \ - unsigned long foreground) + void XSetForeground(Display *display, GC gc, unsigned long foreground) } - declare 64 {mac aqua} { - void XSetClipMask(Display* display, GC gc, Pixmap pixmap) + void XSetClipMask(Display *display, GC gc, Pixmap pixmap) } - declare 65 {mac aqua} { - void XSetClipOrigin(Display* display, GC gc, \ + void XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin) } - declare 66 {mac aqua} { - void XSetTSOrigin(Display* display, GC gc, \ + void XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin) } - declare 67 {mac aqua} { - void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values) + void XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) } - declare 68 {mac aqua} { void XSetFont(Display *display, GC gc, Font font) } - declare 69 {mac aqua} { void XSetArcMode(Display *display, GC gc, int arc_mode) } - declare 70 {mac aqua} { void XSetStipple(Display *display, GC gc, Pixmap stipple) } - declare 71 {mac aqua} { void XSetFillRule(Display *display, GC gc, int fill_rule) } - declare 72 {mac aqua} { void XSetFillStyle(Display *display, GC gc, int fill_style) } - declare 73 {mac aqua} { void XSetFunction(Display *display, GC gc, int function) } - declare 74 {mac aqua} { - void XSetLineAttributes(Display *display, GC gc, \ - unsigned int line_width, int line_style, \ + void XSetLineAttributes(Display *display, GC gc, + unsigned int line_width, int line_style, int cap_style, int join_style) } - declare 75 {mac aqua} { int _XInitImageFuncPtrs(XImage *image) } - declare 76 {mac aqua} { XIC XCreateIC(void) } - declare 77 {mac aqua} { - XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \ - XVisualInfo* vinfo_template, int* nitems_return) + XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, + XVisualInfo *vinfo_template, int *nitems_return) } - declare 78 {mac aqua} { - void XSetWMClientMachine(Display* display, Window w, \ - XTextProperty* text_prop) + void XSetWMClientMachine(Display *display, Window w, + XTextProperty *text_prop) } - declare 79 {mac aqua} { - Status XStringListToTextProperty(char** list, int count, \ - XTextProperty* text_prop_return) + Status XStringListToTextProperty(char **list, int count, + XTextProperty *text_prop_return) } declare 80 {mac aqua} { - void XDrawSegments(Display *display, Drawable d, GC gc, \ - XSegment *segments, int nsegments) + void XDrawSegments(Display *display, Drawable d, GC gc, + XSegment *segments, int nsegments) } declare 81 {mac aqua} { - void XForceScreenSaver(Display* display, int mode) + void XForceScreenSaver(Display *display, int mode) } declare 82 {mac aqua} { - void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \ + void XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2) } declare 83 {mac aqua} { - void XFillRectangle (Display* display, Drawable d, GC gc, \ + void XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) } declare 84 {mac aqua} { - void XClearWindow (Display* d, Window w) + void XClearWindow(Display *d, Window w) } - declare 85 {mac aqua} { - void XDrawPoint (Display* display, Drawable d, GC gc, int x, int y) + void XDrawPoint(Display *display, Drawable d, GC gc, int x, int y) } - declare 86 {mac aqua} { - void XDrawPoints (Display* display, Drawable d, GC gc, XPoint *points, \ + void XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode) } - declare 87 {mac aqua} { - void XWarpPointer (Display* display, Window src_w, Window dest_w, \ - int src_x, int src_y, unsigned int src_width, \ + void XWarpPointer(Display *display, Window src_w, Window dest_w, + int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y) } - declare 88 {mac aqua} { - void XQueryColor (Display *display, Colormap colormap, XColor *def_in_out) + void XQueryColor(Display *display, Colormap colormap, XColor *def_in_out) } - declare 89 {mac aqua} { - void XQueryColors (Display *display, Colormap colormap, \ + void XQueryColors(Display *display, Colormap colormap, XColor *defs_in_out, int ncolors) } - declare 90 {mac aqua} { - Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \ - Window** w4, unsigned int* ui) + Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, + Window **w4, unsigned int *ui) } -declare 91 {aqua} { +declare 91 aqua { int XSync(Display *display, Bool flag) } + +# Local Variables: +# mode: tcl +# End: diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index e7f2472..280e6c8 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -143,7 +143,7 @@ EXTERN CONST84_RETURN char * TkGetDefaultScreenName _ANSI_ARGS_(( EXTERN TkDisplay * TkGetDisplay _ANSI_ARGS_((Display *display)); /* 35 */ EXTERN int TkGetDisplayOf _ANSI_ARGS_((Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj * CONST objv[], Tk_Window *tkwinPtr)); /* 36 */ EXTERN TkWindow * TkGetFocusWin _ANSI_ARGS_((TkWindow *winPtr)); @@ -266,12 +266,12 @@ EXTERN int TkpWindowWasRecentlyDeleted _ANSI_ARGS_((Window win, EXTERN void TkQueueEventForAllChildren _ANSI_ARGS_(( TkWindow *winPtr, XEvent *eventPtr)); /* 78 */ -EXTERN int TkReadBitmapFile _ANSI_ARGS_((Display*display, - Drawable d, CONST char*filename, - unsigned int*width_return, - unsigned int*height_return, - Pixmap*bitmap_return, int*x_hot_return, - int*y_hot_return)); +EXTERN int TkReadBitmapFile _ANSI_ARGS_((Display *display, + Drawable d, CONST char *filename, + unsigned int *width_return, + unsigned int *height_return, + Pixmap *bitmap_return, int *x_hot_return, + int *y_hot_return)); /* 79 */ EXTERN int TkScrollWindow _ANSI_ARGS_((Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, @@ -365,17 +365,17 @@ EXTERN void TkpMenuThreadInit _ANSI_ARGS_((void)); #ifdef __WIN32__ /* 113 */ EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle*rect_return)); + XRectangle *rect_return)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 113 */ EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle*rect_return)); + XRectangle *rect_return)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 113 */ EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle*rect_return)); + XRectangle *rect_return)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 114 */ @@ -436,32 +436,32 @@ EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); #endif /* MAC_OSX_TK */ /* Slot 120 is reserved */ @@ -602,7 +602,7 @@ typedef struct TkIntStubs { TkCursor * (*tkGetCursorByName) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string)); /* 32 */ CONST84_RETURN char * (*tkGetDefaultScreenName) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *screenName)); /* 33 */ TkDisplay * (*tkGetDisplay) _ANSI_ARGS_((Display *display)); /* 34 */ - int (*tkGetDisplayOf) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Tk_Window *tkwinPtr)); /* 35 */ + int (*tkGetDisplayOf) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[], Tk_Window *tkwinPtr)); /* 35 */ TkWindow * (*tkGetFocusWin) _ANSI_ARGS_((TkWindow *winPtr)); /* 36 */ int (*tkGetInterpNames) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 37 */ int (*tkGetMiterPoints) _ANSI_ARGS_((double p1[], double p2[], double p3[], double width, double m1[], double m2[])); /* 38 */ @@ -645,7 +645,7 @@ typedef struct TkIntStubs { int (*tkpUseWindow) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *string)); /* 75 */ int (*tkpWindowWasRecentlyDeleted) _ANSI_ARGS_((Window win, TkDisplay *dispPtr)); /* 76 */ void (*tkQueueEventForAllChildren) _ANSI_ARGS_((TkWindow *winPtr, XEvent *eventPtr)); /* 77 */ - int (*tkReadBitmapFile) _ANSI_ARGS_((Display*display, Drawable d, CONST char*filename, unsigned int*width_return, unsigned int*height_return, Pixmap*bitmap_return, int*x_hot_return, int*y_hot_return)); /* 78 */ + int (*tkReadBitmapFile) _ANSI_ARGS_((Display *display, Drawable d, CONST char *filename, unsigned int *width_return, unsigned int *height_return, Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return)); /* 78 */ int (*tkScrollWindow) _ANSI_ARGS_((Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn)); /* 79 */ void (*tkSelDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 80 */ void (*tkSelEventProc) _ANSI_ARGS_((Tk_Window tkwin, XEvent *eventPtr)); /* 81 */ @@ -684,13 +684,13 @@ typedef struct TkIntStubs { VOID *reserved113; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle *rect_return)); /* 113 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle *rect_return)); /* 113 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle *rect_return)); /* 113 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ VOID *reserved114; @@ -744,25 +744,25 @@ typedef struct TkIntStubs { VOID *reserved118; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); /* 118 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); /* 118 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); /* 118 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ VOID *reserved119; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* MAC_OSX_TK */ VOID *reserved120; #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 9c04bc0..b59ab19 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -74,7 +74,7 @@ EXTERN COLORREF TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 16 */ EXTERN HDC TkWinGetDrawableDC _ANSI_ARGS_((Display *display, - Drawable d, TkWinDCState*state)); + Drawable d, TkWinDCState *state)); /* 17 */ EXTERN int TkWinGetModifierState _ANSI_ARGS_((void)); /* 18 */ @@ -89,7 +89,7 @@ EXTERN int TkWinHandleMenuEvent _ANSI_ARGS_((HWND *phwnd, EXTERN int TkWinIndexOfColor _ANSI_ARGS_((XColor *colorPtr)); /* 22 */ EXTERN void TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, - HDC hdc, TkWinDCState*state)); + HDC hdc, TkWinDCState *state)); /* 23 */ EXTERN LRESULT TkWinResendEvent _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent *eventPtr)); @@ -440,13 +440,13 @@ typedef struct TkIntPlatStubs { LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 13 */ void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 14 */ COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 15 */ - HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display *display, Drawable d, TkWinDCState*state)); /* 16 */ + HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display *display, Drawable d, TkWinDCState *state)); /* 16 */ int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 17 */ HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 18 */ HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 19 */ int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND *phwnd, UINT *pMessage, WPARAM *pwParam, LPARAM *plParam, LRESULT *plResult)); /* 20 */ int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor *colorPtr)); /* 21 */ - void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState*state)); /* 22 */ + void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState *state)); /* 22 */ LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent *eventPtr)); /* 23 */ HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 24 */ void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 25 */ diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 3039404..77f6b4d 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -38,278 +38,279 @@ #ifdef __WIN32__ /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, - int dash_offset, _Xconst char*dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display *display, GC gc, + int dash_offset, _Xconst char *dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); +EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display *d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, - unsigned int ui1, int i1, int i2, char*cp, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display *d, Visual *v, + unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display *d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, - Visual*v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display *d, Window w, + Visual *v, int i)); /* 7 */ -EXTERN Cursor XCreatePixmapCursor _ANSI_ARGS_((Display*d, - Pixmap p1, Pixmap p2, XColor*x1, XColor*x2, +EXTERN Cursor XCreatePixmapCursor _ANSI_ARGS_((Display *d, + Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)); /* 8 */ -EXTERN Cursor XCreateGlyphCursor _ANSI_ARGS_((Display*d, Font f1, +EXTERN Cursor XCreateGlyphCursor _ANSI_ARGS_((Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, - XColor*x1, XColor*x2)); + XColor *x1, XColor *x2)); /* 9 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 10 */ -EXTERN XHostAddress * XListHosts _ANSI_ARGS_((Display*d, int*i, Bool*b)); +EXTERN XHostAddress * XListHosts _ANSI_ARGS_((Display *d, int *i, Bool *b)); /* 11 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display *d, unsigned int k, int i)); /* 12 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char *c)); /* 13 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display *d, int i)); /* 14 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 15 */ -EXTERN Status XIconifyWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN Status XIconifyWindow _ANSI_ARGS_((Display *d, Window w, int i)); /* 16 */ -EXTERN Status XWithdrawWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN Status XWithdrawWindow _ANSI_ARGS_((Display *d, Window w, int i)); /* 17 */ -EXTERN Status XGetWMColormapWindows _ANSI_ARGS_((Display*d, - Window w, Window**wpp, int*ip)); +EXTERN Status XGetWMColormapWindows _ANSI_ARGS_((Display *d, + Window w, Window **wpp, int *ip)); /* 18 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, - XColor*xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display *d, Colormap c, + XColor *xp)); /* 19 */ -EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display *d, int i)); /* 20 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN void XChangeProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char*c, int i3)); + _Xconst unsigned char *c, int i3)); /* 21 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display *d, Window w, unsigned long ul, - XSetWindowAttributes*x)); + XSetWindowAttributes *x)); /* 22 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display *d, Window w)); /* 23 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, - unsigned int i, XWindowChanges*x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display *d, Window w, + unsigned int i, XWindowChanges *x)); /* 24 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyArea _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyPlane _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 26 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, - Drawable d, _Xconst char*data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display *display, + Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 27 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 28 */ -EXTERN void XDeleteProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN void XDeleteProperty _ANSI_ARGS_((Display *d, Window w, Atom a)); /* 29 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display *d, Window w)); /* 30 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 31 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, - XPoint*x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2)); /* 32 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 33 */ -EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XFillArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 34 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XPoint*x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2, int i3)); /* 35 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XRectangle*x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XRectangle *x, int i)); /* 36 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*d, int i)); +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *d, int i)); /* 37 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display *d, Colormap c)); /* 38 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, - unsigned long*ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul)); /* 39 */ -EXTERN void XFreeCursor _ANSI_ARGS_((Display*d, Cursor c)); +EXTERN void XFreeCursor _ANSI_ARGS_((Display *d, Cursor c)); /* 40 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap *x)); /* 41 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, - Window*w, int*i1, int*i2, unsigned int*ui1, - unsigned int*ui2, unsigned int*ui3, - unsigned int*ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display *d, Drawable dr, + Window *w, int *i1, int *i2, + unsigned int *ui1, unsigned int *ui2, + unsigned int *ui3, unsigned int *ui4)); /* 42 */ -EXTERN void XGetInputFocus _ANSI_ARGS_((Display*d, Window*w, - int*i)); +EXTERN void XGetInputFocus _ANSI_ARGS_((Display *d, Window *w, + int *i)); /* 43 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, - Atom*ap, int*ip, unsigned long*ulp1, - unsigned long*ulp2, unsigned char**cpp)); + Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp)); /* 44 */ -EXTERN Status XGetWindowAttributes _ANSI_ARGS_((Display*d, - Window w, XWindowAttributes*x)); +EXTERN Status XGetWindowAttributes _ANSI_ARGS_((Display *d, + Window w, XWindowAttributes *x)); /* 45 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 46 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, +EXTERN int XGrabPointer _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 47 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display *d, KeySym k)); /* 48 */ -EXTERN Status XLookupColor _ANSI_ARGS_((Display*d, Colormap c1, - _Xconst char*c2, XColor*x1, XColor*x2)); +EXTERN Status XLookupColor _ANSI_ARGS_((Display *d, Colormap c1, + _Xconst char *c2, XColor *x1, XColor *x2)); /* 49 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display *d, Window w)); /* 50 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 51 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, - int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display *d, Window w, + int i1, int i2)); /* 52 */ -EXTERN void XNextEvent _ANSI_ARGS_((Display*d, XEvent*x)); +EXTERN void XNextEvent _ANSI_ARGS_((Display *d, XEvent *x)); /* 53 */ -EXTERN void XPutBackEvent _ANSI_ARGS_((Display*d, XEvent*x)); +EXTERN void XPutBackEvent _ANSI_ARGS_((Display *d, XEvent *x)); /* 54 */ -EXTERN void XQueryColors _ANSI_ARGS_((Display*d, Colormap c, - XColor*x, int i)); +EXTERN void XQueryColors _ANSI_ARGS_((Display *d, Colormap c, + XColor *x, int i)); /* 55 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, int*i1, int*i2, int*i3, - int*i4, unsigned int*ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, int *i1, int *i2, + int *i3, int *i4, unsigned int *ui)); /* 56 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, Window**w4, - unsigned int*ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, Window **w4, + unsigned int *ui)); /* 57 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display *d, Window w)); /* 58 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( + XMappingEvent *x)); /* 59 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 60 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display *d, Window w, long l)); /* 61 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, - long l, XEvent*x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b, + long l, XEvent *x)); /* 62 */ -EXTERN void XSetCommand _ANSI_ARGS_((Display*d, Window w, - CONST char**c, int i)); +EXTERN void XSetCommand _ANSI_ARGS_((Display *d, Window w, + CONST char **c, int i)); /* 63 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, - _Xconst char*c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display *d, Window w, + _Xconst char *c)); /* 64 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 65 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 66 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 67 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 68 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 69 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 70 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 71 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 72 */ -EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display*d, - Window w1, Window w2, int i1, int i2, int*i3, - int*i4, Window*w3)); +EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display *d, + Window w1, Window w2, int i1, int i2, + int *i3, int *i4, Window *w3)); /* 73 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t)); /* 74 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display *d, Time t)); /* 75 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display *d, Window w)); /* 76 */ -EXTERN void XWindowEvent _ANSI_ARGS_((Display*d, Window w, - long l, XEvent*x)); +EXTERN void XWindowEvent _ANSI_ARGS_((Display *d, Window w, + long l, XEvent *x)); /* 77 */ EXTERN void XDestroyIC _ANSI_ARGS_((XIC x)); /* 78 */ -EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent*x, Window w)); +EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent *x, Window w)); /* 79 */ EXTERN int XmbLookupString _ANSI_ARGS_((XIC xi, - XKeyPressedEvent*xk, char*c, int i, KeySym*k, - Status*s)); + XKeyPressedEvent *xk, char *c, int i, + KeySym *k, Status *s)); /* 80 */ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, - int ncolors, Display*display, Drawable d, - GC gc, XImage*image, int src_x, int src_y, + int ncolors, Display *display, Drawable d, + GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* Slot 81 is reserved */ /* 82 */ EXTERN Status XParseColor _ANSI_ARGS_((Display *display, - Colormap map, _Xconst char*spec, + Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 83 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, - unsigned long valuemask, XGCValues*values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d, + unsigned long valuemask, XGCValues *values)); /* 84 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc)); /* 85 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, - _Xconst char*atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display, + _Xconst char *atom_name, Bool only_if_exists)); /* 86 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 87 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 88 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 89 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 90 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 91 */ EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, @@ -342,234 +343,235 @@ EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 100 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 101 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, - long vinfo_mask, XVisualInfo*vinfo_template, - int*nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display *display, + long vinfo_mask, XVisualInfo *vinfo_template, + int *nitems_return)); /* 102 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, - Window w, XTextProperty*text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display *display, + Window w, XTextProperty *text_prop)); /* 103 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, - int count, XTextProperty*text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char **list, + int count, XTextProperty *text_prop_return)); /* 104 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 105 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display*d, Window s, +EXTERN void XWarpPointer _ANSI_ARGS_((Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 106 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, +EXTERN void XFillRectangle _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, - int dash_offset, _Xconst char*dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display *display, GC gc, + int dash_offset, _Xconst char *dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); +EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display *d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, - unsigned int ui1, int i1, int i2, char*cp, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display *d, Visual *v, + unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display *d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, - Visual*v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display *d, Window w, + Visual *v, int i)); /* 7 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 8 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, KeyCode k, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 9 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char *c)); /* 10 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display *d, int i)); /* 11 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 12 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, - XColor*xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display *d, Colormap c, + XColor *xp)); /* 13 */ -EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display *d, int i)); /* 14 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN void XChangeProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char*c, int i3)); + _Xconst unsigned char *c, int i3)); /* 15 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display *d, Window w, unsigned long ul, - XSetWindowAttributes*x)); + XSetWindowAttributes *x)); /* 16 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, - unsigned int i, XWindowChanges*x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display *d, Window w, + unsigned int i, XWindowChanges *x)); /* 17 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyArea _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 18 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyPlane _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 19 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, - Drawable d, _Xconst char*data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display *display, + Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 20 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 21 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display *d, Window w)); /* 22 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, - XPoint*x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2)); /* 24 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 25 */ -EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XFillArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 26 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XPoint*x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2, int i3)); /* 27 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XRectangle*x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XRectangle *x, int i)); /* 28 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display *d, Colormap c)); /* 29 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, - unsigned long*ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul)); /* 30 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap *x)); /* 31 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, - Window*w, int*i1, int*i2, unsigned int*ui1, - unsigned int*ui2, unsigned int*ui3, - unsigned int*ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display *d, Drawable dr, + Window *w, int *i1, int *i2, + unsigned int *ui1, unsigned int *ui2, + unsigned int *ui3, unsigned int *ui4)); /* 32 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, - Atom*ap, int*ip, unsigned long*ulp1, - unsigned long*ulp2, unsigned char**cpp)); + Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp)); /* 33 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 34 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, +EXTERN int XGrabPointer _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 35 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display *d, KeySym k)); /* 36 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display *d, Window w)); /* 37 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 38 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, - int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display *d, Window w, + int i1, int i2)); /* 39 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, int*i1, int*i2, int*i3, - int*i4, unsigned int*ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, int *i1, int *i2, + int *i3, int *i4, unsigned int *ui)); /* 40 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display *d, Window w)); /* 41 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( + XMappingEvent *x)); /* 42 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 43 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display *d, Window w, long l)); /* 44 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, - long l, XEvent*x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b, + long l, XEvent *x)); /* 45 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, - _Xconst char*c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display *d, Window w, + _Xconst char *c)); /* 46 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 47 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 48 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 49 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 50 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 51 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 52 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 53 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 54 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t)); /* 55 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display *d, Time t)); /* 56 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display *d, Window w)); /* 57 */ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, - int ncolors, Display*display, Drawable d, - GC gc, XImage*image, int src_x, int src_y, + int ncolors, Display *display, Drawable d, + GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 58 */ EXTERN Status XParseColor _ANSI_ARGS_((Display *display, - Colormap map, _Xconst char*spec, + Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 59 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, - unsigned long valuemask, XGCValues*values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d, + unsigned long valuemask, XGCValues *values)); /* 60 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc)); /* 61 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, - _Xconst char*atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display, + _Xconst char *atom_name, Bool only_if_exists)); /* 62 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 64 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 65 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 66 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 67 */ EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, @@ -602,39 +604,40 @@ EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 76 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 77 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, - long vinfo_mask, XVisualInfo*vinfo_template, - int*nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display *display, + long vinfo_mask, XVisualInfo *vinfo_template, + int *nitems_return)); /* 78 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, - Window w, XTextProperty*text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display *display, + Window w, XTextProperty *text_prop)); /* 79 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, - int count, XTextProperty*text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char **list, + int count, XTextProperty *text_prop_return)); /* 80 */ EXTERN void XDrawSegments _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 81 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*display, +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *display, int mode)); /* 82 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 83 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, +EXTERN void XFillRectangle _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 84 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display *d, Window w)); /* 85 */ -EXTERN void XDrawPoint _ANSI_ARGS_((Display*display, Drawable d, +EXTERN void XDrawPoint _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 86 */ -EXTERN void XDrawPoints _ANSI_ARGS_((Display*display, Drawable d, - GC gc, XPoint *points, int npoints, int mode)); +EXTERN void XDrawPoints _ANSI_ARGS_((Display *display, + Drawable d, GC gc, XPoint *points, + int npoints, int mode)); /* 87 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display*display, +EXTERN void XWarpPointer _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, @@ -647,217 +650,218 @@ EXTERN void XQueryColors _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 90 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, Window**w4, - unsigned int*ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, Window **w4, + unsigned int *ui)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, - int dash_offset, _Xconst char*dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display *display, GC gc, + int dash_offset, _Xconst char *dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); +EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display *d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, - unsigned int ui1, int i1, int i2, char*cp, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display *d, Visual *v, + unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display *d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, - Visual*v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display *d, Window w, + Visual *v, int i)); /* 7 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 8 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, KeyCode k, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 9 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char *c)); /* 10 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display *d, int i)); /* 11 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 12 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, - XColor*xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display *d, Colormap c, + XColor *xp)); /* 13 */ -EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display *d, int i)); /* 14 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN void XChangeProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char*c, int i3)); + _Xconst unsigned char *c, int i3)); /* 15 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display *d, Window w, unsigned long ul, - XSetWindowAttributes*x)); + XSetWindowAttributes *x)); /* 16 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, - unsigned int i, XWindowChanges*x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display *d, Window w, + unsigned int i, XWindowChanges *x)); /* 17 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyArea _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 18 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyPlane _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 19 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, - Drawable d, _Xconst char*data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display *display, + Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 20 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 21 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display *d, Window w)); /* 22 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, - XPoint*x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2)); /* 24 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 25 */ -EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XFillArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 26 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XPoint*x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2, int i3)); /* 27 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XRectangle*x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XRectangle *x, int i)); /* 28 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display *d, Colormap c)); /* 29 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, - unsigned long*ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul)); /* 30 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap *x)); /* 31 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, - Window*w, int*i1, int*i2, unsigned int*ui1, - unsigned int*ui2, unsigned int*ui3, - unsigned int*ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display *d, Drawable dr, + Window *w, int *i1, int *i2, + unsigned int *ui1, unsigned int *ui2, + unsigned int *ui3, unsigned int *ui4)); /* 32 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, - Atom*ap, int*ip, unsigned long*ulp1, - unsigned long*ulp2, unsigned char**cpp)); + Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp)); /* 33 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 34 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, +EXTERN int XGrabPointer _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 35 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display *d, KeySym k)); /* 36 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display *d, Window w)); /* 37 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 38 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, - int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display *d, Window w, + int i1, int i2)); /* 39 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, int*i1, int*i2, int*i3, - int*i4, unsigned int*ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, int *i1, int *i2, + int *i3, int *i4, unsigned int *ui)); /* 40 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display *d, Window w)); /* 41 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( + XMappingEvent *x)); /* 42 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 43 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display *d, Window w, long l)); /* 44 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, - long l, XEvent*x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b, + long l, XEvent *x)); /* 45 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, - _Xconst char*c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display *d, Window w, + _Xconst char *c)); /* 46 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 47 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 48 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 49 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 50 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 51 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 52 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 53 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 54 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t)); /* 55 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display *d, Time t)); /* 56 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display *d, Window w)); /* 57 */ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, - int ncolors, Display*display, Drawable d, - GC gc, XImage*image, int src_x, int src_y, + int ncolors, Display *display, Drawable d, + GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 58 */ EXTERN Status XParseColor _ANSI_ARGS_((Display *display, - Colormap map, _Xconst char*spec, + Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 59 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, - unsigned long valuemask, XGCValues*values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d, + unsigned long valuemask, XGCValues *values)); /* 60 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc)); /* 61 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, - _Xconst char*atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display, + _Xconst char *atom_name, Bool only_if_exists)); /* 62 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 64 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 65 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 66 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 67 */ EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, @@ -890,39 +894,40 @@ EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 76 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 77 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, - long vinfo_mask, XVisualInfo*vinfo_template, - int*nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display *display, + long vinfo_mask, XVisualInfo *vinfo_template, + int *nitems_return)); /* 78 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, - Window w, XTextProperty*text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display *display, + Window w, XTextProperty *text_prop)); /* 79 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, - int count, XTextProperty*text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char **list, + int count, XTextProperty *text_prop_return)); /* 80 */ EXTERN void XDrawSegments _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 81 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*display, +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *display, int mode)); /* 82 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 83 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, +EXTERN void XFillRectangle _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 84 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display *d, Window w)); /* 85 */ -EXTERN void XDrawPoint _ANSI_ARGS_((Display*display, Drawable d, +EXTERN void XDrawPoint _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 86 */ -EXTERN void XDrawPoints _ANSI_ARGS_((Display*display, Drawable d, - GC gc, XPoint *points, int npoints, int mode)); +EXTERN void XDrawPoints _ANSI_ARGS_((Display *display, + Drawable d, GC gc, XPoint *points, + int npoints, int mode)); /* 87 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display*display, +EXTERN void XWarpPointer _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, @@ -935,9 +940,9 @@ EXTERN void XQueryColors _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 90 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, Window**w4, - unsigned int*ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, Window **w4, + unsigned int *ui)); /* 91 */ EXTERN int XSync _ANSI_ARGS_((Display *display, Bool flag)); #endif /* MAC_OSX_TK */ @@ -947,97 +952,97 @@ typedef struct TkIntXlibStubs { struct TkIntXlibStubHooks *hooks; #ifdef __WIN32__ - void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */ + XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display *d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ - Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display*d, Pixmap p1, Pixmap p2, XColor*x1, XColor*x2, unsigned int ui1, unsigned int ui2)); /* 7 */ - Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display*d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor*x1, XColor*x2)); /* 8 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display *d, Window w, Visual *v, int i)); /* 6 */ + Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)); /* 7 */ + Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor *x1, XColor *x2)); /* 8 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 9 */ - XHostAddress * (*xListHosts) _ANSI_ARGS_((Display*d, int*i, Bool*b)); /* 10 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, unsigned int k, int i)); /* 11 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 12 */ - Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 13 */ + XHostAddress * (*xListHosts) _ANSI_ARGS_((Display *d, int *i, Bool *b)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display *d, unsigned int k, int i)); /* 11 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char *c)); /* 12 */ + Window (*xRootWindow) _ANSI_ARGS_((Display *d, int i)); /* 13 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 14 */ - Status (*xIconifyWindow) _ANSI_ARGS_((Display*d, Window w, int i)); /* 15 */ - Status (*xWithdrawWindow) _ANSI_ARGS_((Display*d, Window w, int i)); /* 16 */ - Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display*d, Window w, Window**wpp, int*ip)); /* 17 */ - Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 18 */ - void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 19 */ - void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 20 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 21 */ - void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 22 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 23 */ - void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */ - void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 26 */ - void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 27 */ - void (*xDeleteProperty) _ANSI_ARGS_((Display*d, Window w, Atom a)); /* 28 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 29 */ - void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */ - void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 31 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */ - void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */ - void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 34 */ - void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 35 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display*d, int i)); /* 36 */ - void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 37 */ - void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 38 */ - void (*xFreeCursor) _ANSI_ARGS_((Display*d, Cursor c)); /* 39 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 40 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 41 */ - void (*xGetInputFocus) _ANSI_ARGS_((Display*d, Window*w, int*i)); /* 42 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 43 */ - Status (*xGetWindowAttributes) _ANSI_ARGS_((Display*d, Window w, XWindowAttributes*x)); /* 44 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */ - int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 47 */ - Status (*xLookupColor) _ANSI_ARGS_((Display*d, Colormap c1, _Xconst char*c2, XColor*x1, XColor*x2)); /* 48 */ - void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 49 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */ - void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 51 */ - void (*xNextEvent) _ANSI_ARGS_((Display*d, XEvent*x)); /* 52 */ - void (*xPutBackEvent) _ANSI_ARGS_((Display*d, XEvent*x)); /* 53 */ - void (*xQueryColors) _ANSI_ARGS_((Display*d, Colormap c, XColor*x, int i)); /* 54 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 55 */ - Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 56 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 57 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 58 */ - void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */ - void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 60 */ - Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 61 */ - void (*xSetCommand) _ANSI_ARGS_((Display*d, Window w, CONST char**c, int i)); /* 62 */ - void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 63 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 64 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 65 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 66 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 67 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 68 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 69 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 70 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 71 */ - Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display*d, Window w1, Window w2, int i1, int i2, int*i3, int*i4, Window*w3)); /* 72 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 73 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 74 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 75 */ - void (*xWindowEvent) _ANSI_ARGS_((Display*d, Window w, long l, XEvent*x)); /* 76 */ + Status (*xIconifyWindow) _ANSI_ARGS_((Display *d, Window w, int i)); /* 15 */ + Status (*xWithdrawWindow) _ANSI_ARGS_((Display *d, Window w, int i)); /* 16 */ + Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display *d, Window w, Window **wpp, int *ip)); /* 17 */ + Status (*xAllocColor) _ANSI_ARGS_((Display *d, Colormap c, XColor *xp)); /* 18 */ + void (*xBell) _ANSI_ARGS_((Display *d, int i)); /* 19 */ + void (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 20 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 21 */ + void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 22 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 23 */ + void (*xCopyArea) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */ + void (*xCopyPlane) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 26 */ + void (*xDefineCursor) _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 27 */ + void (*xDeleteProperty) _ANSI_ARGS_((Display *d, Window w, Atom a)); /* 28 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 29 */ + void (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */ + void (*xDrawLines) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)); /* 31 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */ + void (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */ + void (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 34 */ + void (*xFillRectangles) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XRectangle *x, int i)); /* 35 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display *d, int i)); /* 36 */ + void (*xFreeColormap) _ANSI_ARGS_((Display *d, Colormap c)); /* 37 */ + void (*xFreeColors) _ANSI_ARGS_((Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul)); /* 38 */ + void (*xFreeCursor) _ANSI_ARGS_((Display *d, Cursor c)); /* 39 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap *x)); /* 40 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4)); /* 41 */ + void (*xGetInputFocus) _ANSI_ARGS_((Display *d, Window *w, int *i)); /* 42 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp)); /* 43 */ + Status (*xGetWindowAttributes) _ANSI_ARGS_((Display *d, Window w, XWindowAttributes *x)); /* 44 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */ + int (*xGrabPointer) _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display *d, KeySym k)); /* 47 */ + Status (*xLookupColor) _ANSI_ARGS_((Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2)); /* 48 */ + void (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 49 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */ + void (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 51 */ + void (*xNextEvent) _ANSI_ARGS_((Display *d, XEvent *x)); /* 52 */ + void (*xPutBackEvent) _ANSI_ARGS_((Display *d, XEvent *x)); /* 53 */ + void (*xQueryColors) _ANSI_ARGS_((Display *d, Colormap c, XColor *x, int i)); /* 54 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui)); /* 55 */ + Status (*xQueryTree) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui)); /* 56 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 57 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 58 */ + void (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */ + void (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 60 */ + Status (*xSendEvent) _ANSI_ARGS_((Display *d, Window w, Bool b, long l, XEvent *x)); /* 61 */ + void (*xSetCommand) _ANSI_ARGS_((Display *d, Window w, CONST char **c, int i)); /* 62 */ + void (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 63 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 64 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 65 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 66 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 67 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 68 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 69 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 70 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 71 */ + Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3)); /* 72 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 73 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display *d, Time t)); /* 74 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 75 */ + void (*xWindowEvent) _ANSI_ARGS_((Display *d, Window w, long l, XEvent *x)); /* 76 */ void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 77 */ - Bool (*xFilterEvent) _ANSI_ARGS_((XEvent*x, Window w)); /* 78 */ - int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent*xk, char*c, int i, KeySym*k, Status*s)); /* 79 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 80 */ + Bool (*xFilterEvent) _ANSI_ARGS_((XEvent *x, Window w)); /* 78 */ + int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s)); /* 79 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 80 */ VOID *reserved81; - Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 82 */ - GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 83 */ - void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 84 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 85 */ - void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 86 */ - void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 87 */ - void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 88 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */ + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 82 */ + GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 83 */ + void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 84 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 85 */ + void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 86 */ + void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 87 */ + void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 88 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */ void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 91 */ void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 92 */ void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 93 */ @@ -1048,81 +1053,81 @@ typedef struct TkIntXlibStubs { void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 98 */ int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 99 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 100 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 101 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 102 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 103 */ - void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */ - void (*xWarpPointer) _ANSI_ARGS_((Display*d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */ - void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 101 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 102 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 103 */ + void (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */ + void (*xWarpPointer) _ANSI_ARGS_((Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */ + void (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */ + XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display *d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display *d, Window w, Visual *v, int i)); /* 6 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, KeyCode k, int i)); /* 8 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 9 */ - Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 8 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char *c)); /* 9 */ + Window (*xRootWindow) _ANSI_ARGS_((Display *d, int i)); /* 10 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */ - Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 12 */ - void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 13 */ - void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 14 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 15 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 16 */ - void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ - void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 19 */ - void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 20 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 21 */ - void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ - void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 23 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ - void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ - void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 26 */ - void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 27 */ - void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 28 */ - void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 29 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 30 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 31 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 32 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ - int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 35 */ - void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 36 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ - void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 38 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 39 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 40 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 41 */ - void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ - void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 43 */ - Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 44 */ - void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 45 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 46 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 47 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 48 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 49 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 50 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 51 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 52 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 53 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 54 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 55 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 56 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ - Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 58 */ - GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 59 */ - void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 60 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 61 */ - void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 62 */ - void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 63 */ - void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 64 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ + Status (*xAllocColor) _ANSI_ARGS_((Display *d, Colormap c, XColor *xp)); /* 12 */ + void (*xBell) _ANSI_ARGS_((Display *d, int i)); /* 13 */ + void (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 14 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 15 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 16 */ + void (*xCopyArea) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ + void (*xCopyPlane) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 19 */ + void (*xDefineCursor) _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 20 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 21 */ + void (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ + void (*xDrawLines) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)); /* 23 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ + void (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ + void (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 26 */ + void (*xFillRectangles) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XRectangle *x, int i)); /* 27 */ + void (*xFreeColormap) _ANSI_ARGS_((Display *d, Colormap c)); /* 28 */ + void (*xFreeColors) _ANSI_ARGS_((Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul)); /* 29 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap *x)); /* 30 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4)); /* 31 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp)); /* 32 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ + int (*xGrabPointer) _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display *d, KeySym k)); /* 35 */ + void (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 36 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ + void (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 38 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui)); /* 39 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 40 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 41 */ + void (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ + void (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 43 */ + Status (*xSendEvent) _ANSI_ARGS_((Display *d, Window w, Bool b, long l, XEvent *x)); /* 44 */ + void (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 45 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 46 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 47 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 48 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 49 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 50 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 51 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 52 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 53 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 54 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display *d, Time t)); /* 55 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 56 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 58 */ + GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 59 */ + void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 61 */ + void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */ + void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */ + void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */ void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */ void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */ @@ -1133,89 +1138,89 @@ typedef struct TkIntXlibStubs { void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 77 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 78 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 79 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 77 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 78 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 79 */ void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display*display, int mode)); /* 81 */ - void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ - void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ - void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 84 */ - void (*xDrawPoint) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y)); /* 85 */ - void (*xDrawPoints) _ANSI_ARGS_((Display*display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ - void (*xWarpPointer) _ANSI_ARGS_((Display*display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */ + void (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ + void (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ + void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 84 */ + void (*xDrawPoint) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 85 */ + void (*xDrawPoints) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ + void (*xWarpPointer) _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ void (*xQueryColor) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *def_in_out)); /* 88 */ void (*xQueryColors) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 89 */ - Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 90 */ + Status (*xQueryTree) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui)); /* 90 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */ + XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display *d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display *d, Window w, Visual *v, int i)); /* 6 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, KeyCode k, int i)); /* 8 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 9 */ - Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 8 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char *c)); /* 9 */ + Window (*xRootWindow) _ANSI_ARGS_((Display *d, int i)); /* 10 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */ - Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 12 */ - void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 13 */ - void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 14 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 15 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 16 */ - void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ - void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 19 */ - void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 20 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 21 */ - void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ - void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 23 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ - void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ - void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 26 */ - void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 27 */ - void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 28 */ - void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 29 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 30 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 31 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 32 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ - int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 35 */ - void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 36 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ - void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 38 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 39 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 40 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 41 */ - void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ - void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 43 */ - Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 44 */ - void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 45 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 46 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 47 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 48 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 49 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 50 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 51 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 52 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 53 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 54 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 55 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 56 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ - Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 58 */ - GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 59 */ - void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 60 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 61 */ - void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 62 */ - void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 63 */ - void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 64 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ + Status (*xAllocColor) _ANSI_ARGS_((Display *d, Colormap c, XColor *xp)); /* 12 */ + void (*xBell) _ANSI_ARGS_((Display *d, int i)); /* 13 */ + void (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 14 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 15 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 16 */ + void (*xCopyArea) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ + void (*xCopyPlane) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 19 */ + void (*xDefineCursor) _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 20 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 21 */ + void (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ + void (*xDrawLines) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)); /* 23 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ + void (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ + void (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 26 */ + void (*xFillRectangles) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XRectangle *x, int i)); /* 27 */ + void (*xFreeColormap) _ANSI_ARGS_((Display *d, Colormap c)); /* 28 */ + void (*xFreeColors) _ANSI_ARGS_((Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul)); /* 29 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap *x)); /* 30 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4)); /* 31 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp)); /* 32 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ + int (*xGrabPointer) _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display *d, KeySym k)); /* 35 */ + void (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 36 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ + void (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 38 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui)); /* 39 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 40 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 41 */ + void (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ + void (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 43 */ + Status (*xSendEvent) _ANSI_ARGS_((Display *d, Window w, Bool b, long l, XEvent *x)); /* 44 */ + void (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 45 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 46 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 47 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 48 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 49 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 50 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 51 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 52 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 53 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 54 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display *d, Time t)); /* 55 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 56 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 58 */ + GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 59 */ + void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 61 */ + void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */ + void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */ + void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */ void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */ void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */ @@ -1226,20 +1231,20 @@ typedef struct TkIntXlibStubs { void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 77 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 78 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 79 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 77 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 78 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 79 */ void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display*display, int mode)); /* 81 */ - void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ - void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ - void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 84 */ - void (*xDrawPoint) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y)); /* 85 */ - void (*xDrawPoints) _ANSI_ARGS_((Display*display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ - void (*xWarpPointer) _ANSI_ARGS_((Display*display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */ + void (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ + void (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ + void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 84 */ + void (*xDrawPoint) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 85 */ + void (*xDrawPoints) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ + void (*xWarpPointer) _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ void (*xQueryColor) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *def_in_out)); /* 88 */ void (*xQueryColors) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 89 */ - Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 90 */ + Status (*xQueryTree) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui)); /* 90 */ int (*xSync) _ANSI_ARGS_((Display *display, Bool flag)); /* 91 */ #endif /* MAC_OSX_TK */ } TkIntXlibStubs; diff --git a/generic/tkMain.c b/generic/tkMain.c index 34f9054..65a42a6 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -126,7 +126,7 @@ Tk_MainEx(argc, argv, appInitProc, interp) tsdPtr->interp = interp; Tcl_Preserve((ClientData) interp); -#if (defined(__WIN32__) || defined(MAC_TCL)) +#if ((defined(__WIN32__) && !defined(__CYGWIN__)) || defined(MAC_TCL)) Tk_InitConsoleChannels(interp); #endif diff --git a/unix/configure b/unix/configure index 2a30761..0e2a252 100755 --- a/unix/configure +++ b/unix/configure @@ -4044,6 +4044,10 @@ fi CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + echo "$ac_t""no" 1>&6 else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' @@ -4091,21 +4095,21 @@ TK_DBGX=${DBGX} echo $ac_n "checking for required early compiler flags""... $ac_c" 1>&6 -echo "configure:4095: checking for required early compiler flags" >&5 +echo "configure:4099: checking for required early compiler flags" >&5 tcl_flags="" if eval "test \"`echo '$''{'tcl_cv_flag__isoc99_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = (char *)strtoll; char *q = (char *)strtoull; ; return 0; } EOF -if { (eval echo configure:4109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__isoc99_source=no else @@ -4113,7 +4117,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -4121,7 +4125,7 @@ int main() { char *p = (char *)strtoll; char *q = (char *)strtoull; ; return 0; } EOF -if { (eval echo configure:4125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__isoc99_source=yes else @@ -4148,14 +4152,14 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct stat64 buf; int i = stat64("/", &buf); ; return 0; } EOF -if { (eval echo configure:4159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile64_source=no else @@ -4163,7 +4167,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -4171,7 +4175,7 @@ int main() { struct stat64 buf; int i = stat64("/", &buf); ; return 0; } EOF -if { (eval echo configure:4175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile64_source=yes else @@ -4198,14 +4202,14 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = (char *)open64; ; return 0; } EOF -if { (eval echo configure:4209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile_source64=no else @@ -4213,7 +4217,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -4221,7 +4225,7 @@ int main() { char *p = (char *)open64; ; return 0; } EOF -if { (eval echo configure:4225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile_source64=yes else @@ -4252,7 +4256,7 @@ EOF echo $ac_n "checking for 64-bit integer type""... $ac_c" 1>&6 -echo "configure:4256: checking for 64-bit integer type" >&5 +echo "configure:4260: checking for 64-bit integer type" >&5 if eval "test \"`echo '$''{'tcl_cv_type_64bit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4260,14 +4264,14 @@ else tcl_cv_type_64bit=none # See if the compiler knows natively about __int64 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_type_64bit=__int64 else @@ -4281,7 +4285,7 @@ rm -f conftest* # type that is our current guess for a 64-bit type inside this check # program, so it should be modified only carefully... cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_64bit=${tcl_type_64bit} else @@ -4315,13 +4319,13 @@ EOF # Now check for auxiliary declarations echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6 -echo "configure:4319: checking for struct dirent64" >&5 +echo "configure:4323: checking for struct dirent64" >&5 if eval "test \"`echo '$''{'tcl_cv_struct_dirent64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4329,7 +4333,7 @@ int main() { struct dirent64 p; ; return 0; } EOF -if { (eval echo configure:4333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_struct_dirent64=yes else @@ -4350,13 +4354,13 @@ EOF fi echo $ac_n "checking for struct stat64""... $ac_c" 1>&6 -echo "configure:4354: checking for struct stat64" >&5 +echo "configure:4358: checking for struct stat64" >&5 if eval "test \"`echo '$''{'tcl_cv_struct_stat64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -4364,7 +4368,7 @@ struct stat64 p; ; return 0; } EOF -if { (eval echo configure:4368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_struct_stat64=yes else @@ -4387,12 +4391,12 @@ EOF for ac_func in open64 lseek64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4391: checking for $ac_func" >&5 +echo "configure:4395: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4440,13 +4444,13 @@ fi done echo $ac_n "checking for off64_t""... $ac_c" 1>&6 -echo "configure:4444: checking for off64_t" >&5 +echo "configure:4448: checking for off64_t" >&5 if eval "test \"`echo '$''{'tcl_cv_type_off64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -4454,7 +4458,7 @@ off64_t offset; ; return 0; } EOF -if { (eval echo configure:4458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_off64_t=yes else @@ -4485,14 +4489,14 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4489: checking whether byte ordering is bigendian" >&5 +echo "configure:4493: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4503,11 +4507,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4518,7 +4522,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4538,7 +4542,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -4603,20 +4607,20 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for fd_set in sys/types""... $ac_c" 1>&6 -echo "configure:4607: checking for fd_set in sys/types" >&5 +echo "configure:4611: checking for fd_set in sys/types" >&5 if eval "test \"`echo '$''{'tcl_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:4620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_fd_set=yes else @@ -4632,13 +4636,13 @@ echo "$ac_t""$tcl_cv_type_fd_set" 1>&6 tk_ok=$tcl_cv_type_fd_set if test $tk_ok = no; then echo $ac_n "checking for fd_mask in sys/select""... $ac_c" 1>&6 -echo "configure:4636: checking for fd_mask in sys/select" >&5 +echo "configure:4640: checking for fd_mask in sys/select" >&5 if eval "test \"`echo '$''{'tcl_cv_grep_fd_mask'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -4678,17 +4682,17 @@ for ac_hdr in sys/time.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4682: checking for $ac_hdr" >&5 +echo "configure:4686: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4715,12 +4719,12 @@ fi done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4719: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4723: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4729,7 +4733,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4759,12 +4763,12 @@ fi echo $ac_n "checking for strtod""... $ac_c" 1>&6 -echo "configure:4763: checking for strtod" >&5 +echo "configure:4767: checking for strtod" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtod=yes" else @@ -4809,7 +4813,7 @@ fi if test "$tcl_strtod" = 1; then echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6 -echo "configure:4813: checking for Solaris2.4/Tru64 strtod bugs" >&5 +echo "configure:4817: checking for Solaris2.4/Tru64 strtod bugs" >&5 if eval "test \"`echo '$''{'tcl_cv_strtod_buggy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4818,7 +4822,7 @@ else tcl_cv_strtod_buggy=buggy else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_strtod_buggy=ok else @@ -4872,12 +4876,12 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4876: checking for ANSI C header files" >&5 +echo "configure:4880: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4885,7 +4889,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4902,7 +4906,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4920,7 +4924,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4941,7 +4945,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4952,7 +4956,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4976,12 +4980,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4980: checking for mode_t" >&5 +echo "configure:4984: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5009,12 +5013,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:5013: checking for pid_t" >&5 +echo "configure:5017: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5042,12 +5046,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5046: checking for size_t" >&5 +echo "configure:5050: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5075,12 +5079,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5079: checking for uid_t in sys/types.h" >&5 +echo "configure:5083: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -5114,20 +5118,20 @@ fi #------------------------------------------- echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6 -echo "configure:5118: checking pw_gecos in struct pwd" >&5 +echo "configure:5122: checking pw_gecos in struct pwd" >&5 if eval "test \"`echo '$''{'tcl_cv_pwd_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct passwd pwd; pwd.pw_gecos; ; return 0; } EOF -if { (eval echo configure:5131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_pwd_pw_gecos=yes else @@ -5153,7 +5157,7 @@ fi if test "`uname -s`" = "Darwin" ; then echo $ac_n "checking whether to use Aqua""... $ac_c" 1>&6 -echo "configure:5157: checking whether to use Aqua" >&5 +echo "configure:5161: checking whether to use Aqua" >&5 # Check whether --enable-aqua or --disable-aqua was given. if test "${enable_aqua+set}" = set; then enableval="$enable_aqua" @@ -5180,7 +5184,7 @@ fi if test "$fat_32_64" = yes; then if test $tk_aqua = no; then echo $ac_n "checking for 64-bit X11""... $ac_c" 1>&6 -echo "configure:5184: checking for 64-bit X11" >&5 +echo "configure:5188: checking for 64-bit X11" >&5 if eval "test \"`echo '$''{'tcl_cv_lib_x11_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5191,14 +5195,14 @@ else CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include" LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11" cat > conftest.$ac_ext < int main() { XrmInitialize(); ; return 0; } EOF -if { (eval echo configure:5202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_lib_x11_64=yes else @@ -5258,7 +5262,7 @@ else # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5262: checking for X" >&5 +echo "configure:5266: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5320,12 +5324,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5394,14 +5398,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5491,12 +5495,12 @@ fi if test "$no_x" = ""; then if test "$x_includes" = ""; then cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -5516,15 +5520,15 @@ rm -f conftest* fi if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then echo $ac_n "checking for X11 header files""... $ac_c" 1>&6 -echo "configure:5520: checking for X11 header files" >&5 +echo "configure:5524: checking for X11 header files" >&5 found_xincludes="no" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5560,7 +5564,7 @@ rm -f conftest* if test "$no_x" = yes; then echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6 -echo "configure:5564: checking for X11 libraries" >&5 +echo "configure:5568: checking for X11 libraries" >&5 XLIBSW=nope dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" for i in $dirs ; do @@ -5580,7 +5584,7 @@ echo "configure:5564: checking for X11 libraries" >&5 fi if test "$XLIBSW" = nope ; then echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6 -echo "configure:5584: checking for XCreateWindow in -lXwindow" >&5 +echo "configure:5588: checking for XCreateWindow in -lXwindow" >&5 ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5588,7 +5592,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXwindow $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5676,7 +5680,7 @@ eval "LD_SEARCH_FLAGS=\"$TCL_LD_SEARCH_FLAGS\"" if test $tk_aqua = no; then echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:5680: checking for main in -lXbsd" >&5 +echo "configure:5684: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5684,14 +5688,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lXbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5715,12 +5719,12 @@ fi tk_checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5719: checking for connect" >&5 +echo "configure:5723: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5765,7 +5769,7 @@ fi if test "$tk_checkSocket" = 1; then echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:5769: checking for main in -lsocket" >&5 +echo "configure:5773: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5773,14 +5777,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5806,12 +5810,12 @@ if test "$tk_checkBoth" = 1; then tk_oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:5810: checking for accept" >&5 +echo "configure:5814: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -5856,12 +5860,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5860: checking for gethostbyname" >&5 +echo "configure:5864: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5902,7 +5906,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5906: checking for main in -lnsl" >&5 +echo "configure:5910: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5910,14 +5914,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5953,13 +5957,13 @@ fi if test -d /usr/include/mit -a $tk_aqua = no; then echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6 -echo "configure:5957: checking MIT X libraries" >&5 +echo "configure:5961: checking MIT X libraries" >&5 tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS -I/usr/include/mit" tk_oldLibs=$LIBS LIBS="$LIBS -lX11-mit" cat > conftest.$ac_ext < @@ -5970,7 +5974,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -5994,14 +5998,14 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:5998: checking whether char is unsigned" >&5 +echo "configure:6002: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -6094,7 +6098,7 @@ if test "`uname -s`" = "Darwin" ; then if test "`uname -s`" = "Darwin" ; then echo $ac_n "checking how to package libraries""... $ac_c" 1>&6 -echo "configure:6098: checking how to package libraries" >&5 +echo "configure:6102: checking how to package libraries" >&5 # Check whether --enable-framework or --disable-framework was given. if test "${enable_framework+set}" = set; then enableval="$enable_framework" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 8ff420a..c804072 100755 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -731,6 +731,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?]) AC_MSG_RESULT([no]) else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' diff --git a/win/configure b/win/configure index 89ed05d..9cacd06 100755 --- a/win/configure +++ b/win/configure @@ -16,6 +16,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-shared build and link with shared libraries [--enable-shared]" ac_help="$ac_help + --with-tcl=DIR use Tcl 8.4 binaries from DIR" +ac_help="$ac_help --enable-64bit enable 64bit support (where applicable)" ac_help="$ac_help --enable-wince enable Win/CE support (where applicable)" @@ -25,8 +27,6 @@ ac_help="$ac_help --enable-symbols build with debugging symbols [--disable-symbols]" ac_help="$ac_help --enable-embedded-manifest embed manifest if possible (default: yes)" -ac_help="$ac_help - --with-tcl=DIR use Tcl 8.4 binaries from DIR" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -1131,6 +1131,94 @@ EOF #-------------------------------------------------------------------- +# Locate and source the tclConfig.sh file. +#-------------------------------------------------------------------- + + + echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 +echo "configure:1140: checking the location of tclConfig.sh" >&5 + + if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win + elif test -d ../../tcl8.4/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.4/win + else + TCL_BIN_DIR_DEFAULT=../../tcl/win + fi + + # Check whether --with-tcl or --without-tcl was given. +if test "${with_tcl+set}" = set; then + withval="$with_tcl" + TCL_BIN_DIR=$withval +else + TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd` +fi + + if test ! -d $TCL_BIN_DIR; then + { echo "configure: error: Tcl directory $TCL_BIN_DIR does not exist" 1>&2; exit 1; } + fi + if test ! -f $TCL_BIN_DIR/tclConfig.sh; then + if test ! -f $TCL_BIN_DIR/../unix/tclConfig.sh; then + { echo "configure: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } + fi + TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd` + fi + echo "$ac_t""$TCL_BIN_DIR/tclConfig.sh" 1>&6 + + + echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 +echo "configure:1171: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 + + if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then + echo "$ac_t""loading" 1>&6 + . $TCL_BIN_DIR/tclConfig.sh + else + echo "$ac_t""file not found" 1>&6 + fi + + # + # If the TCL_BIN_DIR is the build directory (not the install directory), + # then set the common variable name to the value of the build variables. + # For example, the variable TCL_LIB_SPEC will be set to the value + # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC + # instead of TCL_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f $TCL_BIN_DIR/Makefile ; then + TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC} + TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC} + TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH} + fi + + # + # eval is required to do the TCL_DBGX substitution + # + + eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" + eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" + eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" + + eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" + eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" + eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" + + + + + + + + + + + + + + + + +#-------------------------------------------------------------------- # The statements below define a collection of compile flags. This # macro depends on the value of SHARED_BUILD, and should be called # after SC_ENABLE_SHARED checks the configure switches. @@ -1141,7 +1229,7 @@ EOF # Step 0: Enable 64 bit support? echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6 -echo "configure:1145: checking if 64bit support is requested" >&5 +echo "configure:1233: checking if 64bit support is requested" >&5 # Check whether --enable-64bit or --disable-64bit was given. if test "${enable_64bit+set}" = set; then enableval="$enable_64bit" @@ -1155,7 +1243,7 @@ fi # Cross-compiling options for Windows/CE builds echo $ac_n "checking if Windows/CE build is requested""... $ac_c" 1>&6 -echo "configure:1159: checking if Windows/CE build is requested" >&5 +echo "configure:1247: checking if Windows/CE build is requested" >&5 # Check whether --enable-wince or --disable-wince was given. if test "${enable_wince+set}" = set; then enableval="$enable_wince" @@ -1167,7 +1255,7 @@ fi echo "$ac_t""$doWince" 1>&6 echo $ac_n "checking for Windows/CE celib directory""... $ac_c" 1>&6 -echo "configure:1171: checking for Windows/CE celib directory" >&5 +echo "configure:1259: checking for Windows/CE celib directory" >&5 # Check whether --with-celib or --without-celib was given. if test "${with_celib+set}" = set; then withval="$with_celib" @@ -1184,7 +1272,7 @@ fi # Extract the first word of "cygpath", so it can be a program name with args. set dummy cygpath; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1188: checking for $ac_word" >&5 +echo "configure:1276: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CYGPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1220,16 +1308,19 @@ fi if test "$GCC" = "yes"; then + if test "$TCL_CC" = "gcc"; then + CFLAGS="$CFLAGS -mwin32" + fi echo $ac_n "checking for cross-compile version of gcc""... $ac_c" 1>&6 -echo "configure:1225: checking for cross-compile version of gcc" >&5 +echo "configure:1316: checking for cross-compile version of gcc" >&5 if eval "test \"`echo '$''{'ac_cv_cross'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_cross=yes + ac_cv_cross=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_cross=no + ac_cv_cross=yes fi rm -f conftest* @@ -1286,9 +1377,9 @@ echo "$ac_t""$ac_cv_cross" 1>&6 echo "END" >> $conftest echo $ac_n "checking for Windows native path bug in windres""... $ac_c" 1>&6 -echo "configure:1290: checking for Windows native path bug in windres" >&5 +echo "configure:1381: checking for Windows native path bug in windres" >&5 cyg_conftest=`$CYGPATH $conftest` - if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then + if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then echo "$ac_t""no" 1>&6 else echo "$ac_t""yes" 1>&6 @@ -1308,12 +1399,12 @@ echo "configure:1290: checking for Windows native path bug in windres" >&5 if test "${GCC}" = "yes" ; then echo $ac_n "checking for mingw32 version of gcc""... $ac_c" 1>&6 -echo "configure:1312: checking for mingw32 version of gcc" >&5 +echo "configure:1403: checking for mingw32 version of gcc" >&5 if eval "test \"`echo '$''{'ac_cv_win32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_win32=no else @@ -1344,7 +1435,7 @@ echo "$ac_t""$ac_cv_win32" 1>&6 fi echo $ac_n "checking compiler flags""... $ac_c" 1>&6 -echo "configure:1348: checking compiler flags" >&5 +echo "configure:1439: checking compiler flags" >&5 if test "${GCC}" = "yes" ; then SHLIB_LD="" SHLIB_LD_LIBS="" @@ -1443,25 +1534,25 @@ echo "configure:1348: checking compiler flags" >&5 ;; *) cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - tcl_win_64bit=no + tcl_win_64bit=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - tcl_win_64bit=yes + tcl_win_64bit=no fi rm -f conftest* @@ -1694,7 +1785,7 @@ EOF if test "${GCC}" = "yes" ; then echo $ac_n "checking for SEH support in compiler""... $ac_c" 1>&6 -echo "configure:1698: checking for SEH support in compiler" >&5 +echo "configure:1789: checking for SEH support in compiler" >&5 if eval "test \"`echo '$''{'tcl_cv_seh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1702,7 +1793,7 @@ else tcl_cv_seh=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_seh=yes else @@ -1751,12 +1842,12 @@ EOF # sufficient for getting the current code to work. # echo $ac_n "checking for EXCEPTION_DISPOSITION support in include files""... $ac_c" 1>&6 -echo "configure:1755: checking for EXCEPTION_DISPOSITION support in include files" >&5 +echo "configure:1846: checking for EXCEPTION_DISPOSITION support in include files" >&5 if eval "test \"`echo '$''{'tcl_cv_eh_disposition'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_eh_disposition=yes else @@ -1795,12 +1886,12 @@ EOF # used by mingw and cygwin is known to do this. echo $ac_n "checking for winnt.h that ignores VOID define""... $ac_c" 1>&6 -echo "configure:1799: checking for winnt.h that ignores VOID define" >&5 +echo "configure:1890: checking for winnt.h that ignores VOID define" >&5 if eval "test \"`echo '$''{'tcl_cv_winnt_ignore_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_winnt_ignore_void=yes else @@ -1842,12 +1933,12 @@ EOF # warning when initializing a union member. echo $ac_n "checking for cast to union support""... $ac_c" 1>&6 -echo "configure:1846: checking for cast to union support" >&5 +echo "configure:1937: checking for cast to union support" >&5 if eval "test \"`echo '$''{'tcl_cv_cast_to_union'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_cast_to_union=yes else @@ -1891,7 +1982,7 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1895: checking how to run the C preprocessor" >&5 +echo "configure:1986: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1906,13 +1997,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1923,13 +2014,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1940,13 +2031,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1972,17 +2063,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:1976: checking for errno.h" >&5 +echo "configure:2067: checking for errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2012,20 +2103,20 @@ fi if test "${MACHINE}" = "X86" ; then echo $ac_n "checking availability of _strtoi64""... $ac_c" 1>&6 -echo "configure:2016: checking availability of _strtoi64" >&5 +echo "configure:2107: checking availability of _strtoi64" >&5 if eval "test \"`echo '$''{'tcl_have_strtoi64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { _strtoi64(0,0,0) ; return 0; } EOF -if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_have_strtoi64=yes else @@ -2054,7 +2145,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:2058: checking for build with symbols" >&5 +echo "configure:2149: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -2068,6 +2159,10 @@ fi CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + echo "$ac_t""no" 1>&6 else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' @@ -2115,7 +2210,7 @@ TK_DBGX=${DBGX} echo $ac_n "checking whether to embed manifest""... $ac_c" 1>&6 -echo "configure:2119: checking whether to embed manifest" >&5 +echo "configure:2214: checking whether to embed manifest" >&5 # Check whether --enable-embedded-manifest or --disable-embedded-manifest was given. if test "${enable_embedded_manifest+set}" = set; then enableval="$enable_embedded_manifest" @@ -2132,7 +2227,7 @@ fi -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe cat > conftest.$ac_ext <= 1400 @@ -2163,101 +2258,16 @@ rm -f conftest* -#-------------------------------------------------------------------- -# Locate and source the tclConfig.sh file. -#-------------------------------------------------------------------- - - - echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 -echo "configure:2173: checking the location of tclConfig.sh" >&5 - - if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win - elif test -d ../../tcl8.4/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.4/win - else - TCL_BIN_DIR_DEFAULT=../../tcl/win - fi - - # Check whether --with-tcl or --without-tcl was given. -if test "${with_tcl+set}" = set; then - withval="$with_tcl" - TCL_BIN_DIR=$withval -else - TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd` -fi - - if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR does not exist" 1>&2; exit 1; } - fi - if test ! -f $TCL_BIN_DIR/tclConfig.sh; then - { echo "configure: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } - fi - echo "$ac_t""$TCL_BIN_DIR/tclConfig.sh" 1>&6 - - - echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:2201: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 - - if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then - echo "$ac_t""loading" 1>&6 - . $TCL_BIN_DIR/tclConfig.sh - else - echo "$ac_t""file not found" 1>&6 - fi - - # - # If the TCL_BIN_DIR is the build directory (not the install directory), - # then set the common variable name to the value of the build variables. - # For example, the variable TCL_LIB_SPEC will be set to the value - # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC - # instead of TCL_BUILD_LIB_SPEC since it will work with both an - # installed and uninstalled version of Tcl. - # - - if test -f $TCL_BIN_DIR/Makefile ; then - TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC} - TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC} - TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH} - fi - - # - # eval is required to do the TCL_DBGX substitution - # - - eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" - eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" - eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" - - eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" - eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" - eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" - - - - - - - - - - - - - - - - echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6 -echo "configure:2254: checking for tclsh in Tcl build directory" >&5 +echo "configure:2264: checking for tclsh in Tcl build directory" >&5 BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT} echo "$ac_t""$BUILD_TCLSH" 1>&6 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:2261: checking for tclsh" >&5 +echo "configure:2271: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2596,6 +2606,16 @@ s%@SET_MAKE@%$SET_MAKE%g s%@OBJEXT@%$OBJEXT%g s%@EXEEXT@%$EXEEXT%g s%@TCL_THREADS@%$TCL_THREADS%g +s%@TCL_VERSION@%$TCL_VERSION%g +s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g +s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g +s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g +s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g +s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g +s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g +s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g +s%@TCL_DEFS@%$TCL_DEFS%g s%@CYGPATH@%$CYGPATH%g s%@CELIB_DIR@%$CELIB_DIR%g s%@DL_LIBS@%$DL_LIBS%g @@ -2608,16 +2628,6 @@ s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g s%@LDFLAGS_DEFAULT@%$LDFLAGS_DEFAULT%g s%@VC_MANIFEST_EMBED_DLL@%$VC_MANIFEST_EMBED_DLL%g s%@VC_MANIFEST_EMBED_EXE@%$VC_MANIFEST_EMBED_EXE%g -s%@TCL_VERSION@%$TCL_VERSION%g -s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g -s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g -s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g -s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g -s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g -s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g -s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g -s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g -s%@TCL_DEFS@%$TCL_DEFS%g s%@BUILD_TCLSH@%$BUILD_TCLSH%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@TK_WIN_VERSION@%$TK_WIN_VERSION%g diff --git a/win/configure.in b/win/configure.in index ff9e2cc..5e73318 100644 --- a/win/configure.in +++ b/win/configure.in @@ -90,6 +90,13 @@ SC_ENABLE_THREADS SC_ENABLE_SHARED #-------------------------------------------------------------------- +# Locate and source the tclConfig.sh file. +#-------------------------------------------------------------------- + +SC_PATH_TCLCONFIG($TK_PATCH_LEVEL) +SC_LOAD_TCLCONFIG + +#-------------------------------------------------------------------- # The statements below define a collection of compile flags. This # macro depends on the value of SHARED_BUILD, and should be called # after SC_ENABLE_SHARED checks the configure switches. @@ -134,13 +141,6 @@ TK_DBGX=${DBGX} SC_EMBED_MANIFEST(wish.exe.manifest) -#-------------------------------------------------------------------- -# Locate and source the tclConfig.sh file. -#-------------------------------------------------------------------- - -SC_PATH_TCLCONFIG($TK_PATCH_LEVEL) -SC_LOAD_TCLCONFIG - SC_BUILD_TCLSH SC_PROG_TCLSH diff --git a/win/tcl.m4 b/win/tcl.m4 index ab47afc..362b36c 100755 --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -38,7 +38,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?) fi TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd` - CFLAGS="$CFLAGS -mwin32" fi AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh) ]) @@ -304,6 +303,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?]) AC_MSG_RESULT([no]) else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' @@ -317,12 +317,12 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ AC_SUBST(LDFLAGS_DEFAULT) if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then - AC_DEFINE(TCL_MEM_DEBUG) + AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?]) fi if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then - AC_DEFINE(TCL_COMPILE_DEBUG) - AC_DEFINE(TCL_COMPILE_STATS) + AC_DEFINE(TCL_COMPILE_DEBUG, 1, [Is bytecode debugging enabled?]) + AC_DEFINE(TCL_COMPILE_STATS, 1, [Are bytecode statistics enabled?]) fi if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then @@ -414,6 +414,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ if test "$GCC" = "yes"; then + if test "$TCL_CC" = "gcc"; then + CFLAGS="$CFLAGS -mwin32" + fi AC_CACHE_CHECK(for cross-compile version of gcc, ac_cv_cross, AC_TRY_COMPILE([ -- cgit v0.12 From 5a1c57dc0dca93c9e878f66be5632afe0937784e Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 12 Apr 2012 20:05:59 +0000 Subject: disallow colors like "xellow" --- xlib/xcolors.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xlib/xcolors.c b/xlib/xcolors.c index 9e10175..87d58f9 100755 --- a/xlib/xcolors.c +++ b/xlib/xcolors.c @@ -17,8 +17,8 @@ * Index array. For each of the characters 'a'-'y', this table gives the first color * starting with that character in the xColors table. */ -static unsigned char az[] = {0, 4, 12, 19, 43, 43, 46, 56, 58, 60, 60, 61, 84, 99, - 102, 107, 118, 118, 121, 134, 138, 138, 140, 143, 143, 145}; +static unsigned char az[] = {0, 4, 12, 19, 43, 44, 47, 57, 59, 61, 62, 63, 86, 101, + 104, 109, 120, 121, 124, 137, 141, 142, 144, 147, 148, 150}; /* * Define an array that defines the mapping from color names to RGB values. @@ -88,6 +88,7 @@ static const elem xColors[] = { "imGrey\0 \151\151\151\0", "odgerBlue\0 \020\116\213\030\164\315\034\206\356\036\220\377\036\220\377\4", /* Colors starting with 'e' */ + "\377" /* placeholder */, /* Colors starting with 'f' */ "irebrick\0 \213\032\032\315\046\046\356\054\054\377\060\060\262\042\042\4", "loralWhite\0 \377\372\360\0", @@ -112,6 +113,7 @@ static const elem xColors[] = { "ndianRed\0 \213\072\072\315\125\125\356\143\143\377\152\152\315\134\134\4", "vory\0 \213\213\203\315\315\301\356\356\340\377\377\360\377\377\360\4", /* Colors starting with 'j' */ + "\377" /* placeholder */, /* Colors starting with 'k' */ "haki\0 \213\206\116\315\306\163\356\346\205\377\366\217\360\346\214\4", /* Colors starting with 'l' */ @@ -177,6 +179,7 @@ static const elem xColors[] = { "owderBlue\0 \260\340\346\0", "urple\0 \125\032\213\175\046\315\221\054\356\233\060\377\240\040\360\4", /* Colors starting with 'q' */ + "\377" /* placeholder */, /* Colors starting with 'r' */ "ed\0 \213\000\000\315\000\000\356\000\000\377\000\000\377\000\000\4", "osyBrown\0 \213\151\151\315\233\233\356\264\264\377\301\301\274\217\217\4", @@ -201,6 +204,7 @@ static const elem xColors[] = { "omato\0 \213\066\046\315\117\071\356\134\102\377\143\107\377\143\107\4", "urquoise\0 \000\206\213\000\305\315\000\345\356\000\365\377\100\340\320\4", /* Colors starting with 'u' */ + "\377" /* placeholder */, /* Colors starting with 'v' */ "iolet\0 \356\202\356\0", "ioletRed\0 \213\042\122\315\062\170\356\072\214\377\076\226\320\040\220\4", @@ -209,6 +213,7 @@ static const elem xColors[] = { "hite\0 \377\377\377\0", "hiteSmoke\0 \365\365\365\0", /* Colors starting with 'x' */ + "\377" /* placeholder */, /* Colors starting with 'y' */ "ellow\0 \213\213\000\315\315\000\356\356\000\377\377\000\377\377\000\4", "ellowGreen\0 \232\315\062\0" -- cgit v0.12 From 2b6251c4c824d5477da8fa35609508dde84084f7 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 12 Apr 2012 20:42:53 +0000 Subject: re-generate win/configure --- win/configure | 232 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 121 insertions(+), 111 deletions(-) diff --git a/win/configure b/win/configure index 363045e..fc8f41c 100755 --- a/win/configure +++ b/win/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AR ac_ct_AR RANLIB ac_ct_RANLIB RC ac_ct_RC SET_MAKE TCL_THREADS CYGPATH CELIB_DIR DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING MAN2TCLFLAGS CFLAGS_DEFAULT LDFLAGS_DEFAULT VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_DEFS BUILD_TCLSH TCLSH_PROG TK_WIN_VERSION MACHINE TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DBGX TK_LIB_FILE TK_DLL_FILE TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_BUILD_STUB_LIB_SPEC TK_SRC_DIR TK_BIN_DIR TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_DBGX CFG_TK_SHARED_LIB_SUFFIX CFG_TK_UNSHARED_LIB_SUFFIX CFG_TK_EXPORT_FILE_SUFFIX EXTRA_CFLAGS DEPARG CC_OBJNAME CC_EXENAME LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LDFLAGS_CONSOLE LDFLAGS_WINDOW TK_RES STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX TK_SHARED_BUILD LIBS_GUI DLLSUFFIX LIBPREFIX LIBSUFFIX EXESUFFIX LIBRARIES MAKE_LIB POST_MAKE_LIB MAKE_DLL MAKE_EXE TK_LIB_FLAG TK_LIB_SPEC TK_BUILD_LIB_SPEC TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_BUILD_STUB_LIB_PATH TK_CC_SEARCH_FLAGS TK_LD_SEARCH_FLAGS RC_OUT RC_TYPE RC_INCLUDE RC_DEFINE RC_DEFINES RES LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AR ac_ct_AR RANLIB ac_ct_RANLIB RC ac_ct_RC SET_MAKE TCL_THREADS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_DEFS CYGPATH CELIB_DIR DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING MAN2TCLFLAGS CFLAGS_DEFAULT LDFLAGS_DEFAULT VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE BUILD_TCLSH TCLSH_PROG TK_WIN_VERSION MACHINE TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DBGX TK_LIB_FILE TK_DLL_FILE TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_BUILD_STUB_LIB_SPEC TK_SRC_DIR TK_BIN_DIR TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_DBGX CFG_TK_SHARED_LIB_SUFFIX CFG_TK_UNSHARED_LIB_SUFFIX CFG_TK_EXPORT_FILE_SUFFIX EXTRA_CFLAGS DEPARG CC_OBJNAME CC_EXENAME LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LDFLAGS_CONSOLE LDFLAGS_WINDOW TK_RES STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX TK_SHARED_BUILD LIBS_GUI DLLSUFFIX LIBPREFIX LIBSUFFIX EXESUFFIX LIBRARIES MAKE_LIB POST_MAKE_LIB MAKE_DLL MAKE_EXE TK_LIB_FLAG TK_LIB_SPEC TK_BUILD_LIB_SPEC TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_BUILD_STUB_LIB_PATH TK_CC_SEARCH_FLAGS TK_LD_SEARCH_FLAGS RC_OUT RC_TYPE RC_INCLUDE RC_DEFINE RC_DEFINES RES LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -851,8 +851,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-celib=DIR use Windows/CE support library from DIR --with-tcl=DIR use Tcl 8.6 binaries from DIR + --with-celib=DIR use Windows/CE support library from DIR Some influential environment variables: CC C compiler command @@ -3111,6 +3111,101 @@ _ACEOF #-------------------------------------------------------------------- +# Locate and source the tclConfig.sh file. +#-------------------------------------------------------------------- + + + echo "$as_me:$LINENO: checking the location of tclConfig.sh" >&5 +echo $ECHO_N "checking the location of tclConfig.sh... $ECHO_C" >&6 + + if test -d ../../tcl8.6$TK_PATCH_LEVEL/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.6$TK_PATCH_LEVEL/win + elif test -d ../../tcl8.6/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.6/win + else + TCL_BIN_DIR_DEFAULT=../../tcl/win + fi + + +# Check whether --with-tcl or --without-tcl was given. +if test "${with_tcl+set}" = set; then + withval="$with_tcl" + TCL_BIN_DIR=$withval +else + TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd` +fi; + if test ! -d $TCL_BIN_DIR; then + { { echo "$as_me:$LINENO: error: Tcl directory $TCL_BIN_DIR does not exist" >&5 +echo "$as_me: error: Tcl directory $TCL_BIN_DIR does not exist" >&2;} + { (exit 1); exit 1; }; } + fi + if test ! -f $TCL_BIN_DIR/tclConfig.sh; then + if test ! -f $TCL_BIN_DIR/../unix/tclConfig.sh; then + { { echo "$as_me:$LINENO: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" >&5 +echo "$as_me: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" >&2;} + { (exit 1); exit 1; }; } + fi + TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd` + fi + echo "$as_me:$LINENO: result: $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "${ECHO_T}$TCL_BIN_DIR/tclConfig.sh" >&6 + + + echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6 + + if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then + echo "$as_me:$LINENO: result: loading" >&5 +echo "${ECHO_T}loading" >&6 + . $TCL_BIN_DIR/tclConfig.sh + else + echo "$as_me:$LINENO: result: file not found" >&5 +echo "${ECHO_T}file not found" >&6 + fi + + # + # If the TCL_BIN_DIR is the build directory (not the install directory), + # then set the common variable name to the value of the build variables. + # For example, the variable TCL_LIB_SPEC will be set to the value + # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC + # instead of TCL_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f $TCL_BIN_DIR/Makefile ; then + TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC} + TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC} + TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH} + fi + + # + # eval is required to do the TCL_DBGX substitution + # + + eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" + eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" + eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" + + eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" + eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" + eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" + + + + + + + + + + + + + + + + +#-------------------------------------------------------------------- # The statements below define a collection of compile flags. This # macro depends on the value of SHARED_BUILD, and should be called # after SC_ENABLE_SHARED checks the configure switches. @@ -3284,6 +3379,9 @@ fi if test "$GCC" = "yes"; then + if test "$TCL_CC" = "gcc"; then + CFLAGS="$CFLAGS -mwin32" + fi echo "$as_me:$LINENO: checking for cross-compile version of gcc" >&5 echo $ECHO_N "checking for cross-compile version of gcc... $ECHO_C" >&6 if test "${ac_cv_cross+set}" = set; then @@ -4645,6 +4743,11 @@ fi; CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + +cat >>confdefs.h <<\_ACEOF +#define NDEBUG 1 +_ACEOF + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -4669,18 +4772,21 @@ _ACEOF if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define TCL_MEM_DEBUG 1 _ACEOF fi if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define TCL_COMPILE_DEBUG 1 _ACEOF - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define TCL_COMPILE_STATS 1 _ACEOF @@ -4758,102 +4864,6 @@ echo "${ECHO_T}$result" >&6 -#-------------------------------------------------------------------- -# Locate and source the tclConfig.sh file. -#-------------------------------------------------------------------- - - - echo "$as_me:$LINENO: checking the location of tclConfig.sh" >&5 -echo $ECHO_N "checking the location of tclConfig.sh... $ECHO_C" >&6 - - if test -d ../../tcl8.6$TK_PATCH_LEVEL/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.6$TK_PATCH_LEVEL/win - elif test -d ../../tcl8.6/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.6/win - else - TCL_BIN_DIR_DEFAULT=../../tcl/win - fi - - -# Check whether --with-tcl or --without-tcl was given. -if test "${with_tcl+set}" = set; then - withval="$with_tcl" - TCL_BIN_DIR=$withval -else - TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd` -fi; - if test ! -d $TCL_BIN_DIR; then - { { echo "$as_me:$LINENO: error: Tcl directory $TCL_BIN_DIR does not exist" >&5 -echo "$as_me: error: Tcl directory $TCL_BIN_DIR does not exist" >&2;} - { (exit 1); exit 1; }; } - fi - if test ! -f $TCL_BIN_DIR/tclConfig.sh; then - if test ! -f $TCL_BIN_DIR/../unix/tclConfig.sh; then - { { echo "$as_me:$LINENO: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" >&5 -echo "$as_me: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" >&2;} - { (exit 1); exit 1; }; } - fi - TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd` - CFLAGS="$CFLAGS -mwin32" - fi - echo "$as_me:$LINENO: result: $TCL_BIN_DIR/tclConfig.sh" >&5 -echo "${ECHO_T}$TCL_BIN_DIR/tclConfig.sh" >&6 - - - echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 -echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6 - - if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then - echo "$as_me:$LINENO: result: loading" >&5 -echo "${ECHO_T}loading" >&6 - . $TCL_BIN_DIR/tclConfig.sh - else - echo "$as_me:$LINENO: result: file not found" >&5 -echo "${ECHO_T}file not found" >&6 - fi - - # - # If the TCL_BIN_DIR is the build directory (not the install directory), - # then set the common variable name to the value of the build variables. - # For example, the variable TCL_LIB_SPEC will be set to the value - # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC - # instead of TCL_BUILD_LIB_SPEC since it will work with both an - # installed and uninstalled version of Tcl. - # - - if test -f $TCL_BIN_DIR/Makefile ; then - TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC} - TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC} - TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH} - fi - - # - # eval is required to do the TCL_DBGX substitution - # - - eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" - eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" - eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" - - eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" - eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" - eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" - - - - - - - - - - - - - - - - echo "$as_me:$LINENO: checking for tclsh in Tcl build directory" >&5 echo $ECHO_N "checking for tclsh in Tcl build directory... $ECHO_C" >&6 @@ -5710,6 +5720,16 @@ s,@RC@,$RC,;t t s,@ac_ct_RC@,$ac_ct_RC,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@TCL_THREADS@,$TCL_THREADS,;t t +s,@TCL_VERSION@,$TCL_VERSION,;t t +s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t +s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t +s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t +s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t +s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t +s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t +s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t +s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t +s,@TCL_DEFS@,$TCL_DEFS,;t t s,@CYGPATH@,$CYGPATH,;t t s,@CELIB_DIR@,$CELIB_DIR,;t t s,@DL_LIBS@,$DL_LIBS,;t t @@ -5721,16 +5741,6 @@ s,@CFLAGS_DEFAULT@,$CFLAGS_DEFAULT,;t t s,@LDFLAGS_DEFAULT@,$LDFLAGS_DEFAULT,;t t s,@VC_MANIFEST_EMBED_DLL@,$VC_MANIFEST_EMBED_DLL,;t t s,@VC_MANIFEST_EMBED_EXE@,$VC_MANIFEST_EMBED_EXE,;t t -s,@TCL_VERSION@,$TCL_VERSION,;t t -s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t -s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t -s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t -s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t -s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t -s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t -s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t -s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t -s,@TCL_DEFS@,$TCL_DEFS,;t t s,@BUILD_TCLSH@,$BUILD_TCLSH,;t t s,@TCLSH_PROG@,$TCLSH_PROG,;t t s,@TK_WIN_VERSION@,$TK_WIN_VERSION,;t t -- cgit v0.12