Import Tk 8.6.12

generic/ttk/ttkGenStubs.tcl

@@ -4,7 +4,7 @@
 #	interface.
 #
 #
-# Copyright (c) 1998-1999 by Scriptics Corporation.
+# Copyright (c) 1998-1999 Scriptics Corporation.
 # Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -248,8 +248,9 @@ proc genStubs::rewriteFile {file text} {
 	return
     }
     set in [open ${file} r]
+    fconfigure $in -eofchar "\032 {}" -encoding utf-8
     set out [open ${file}.new w]
-    fconfigure $out -translation lf
+    fconfigure $out -translation lf -encoding utf-8
 
     while {![eof $in]} {
 	set line [gets $in]
@@ -688,7 +689,7 @@ proc genStubs::makeInit {name decl index} {
 #			have the interface name, the declaration,  and
 #			the index appended.
 #	guardProc	The proc to invoke to add guards.  It will have
-#		        the slot status and text appended.
+#			the slot status and text appended.
 #	textVar		The variable to use for output.
 #	skipString	The string to emit if a slot is skipped.  This
 #			string will be subst'ed in the loop so "$i" can
@@ -973,7 +974,7 @@ proc genStubs::init {} {
     set outDir [lindex $argv 0]
 
     foreach file [lrange $argv 1 end] {
-	source $file
+	source -encoding utf-8 $file
     }
 
     foreach name [lsort [array names interfaces]] {

generic/ttk/ttkWidget.c

@@ -8,10 +8,6 @@
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
-#ifdef MAC_OSX_TK
-#define TK_NO_DOUBLE_BUFFERING 1
-#endif
-
 /*------------------------------------------------------------------------
  * +++ Internal helper routines.
  */