From 032d4fd9828b704021d738faadf62f421c1c0778 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Tue, 31 Oct 2000 00:52:11 +0000
Subject: 	* tests/tk.test: 	* doc/tk.n: updated to reflect default
 on status of useinputmethods. 	* library/tk.tcl: tk useinputmethods is set to
 1 by default.  This 	enables Kanji and dead-char input by default.  Intro'd
 in 	1999-12-16 with default off to avoid some problems with older X 
 servers that would slow down widget creation over time.

---
 doc/tk.n       | 4 ++--
 library/tk.tcl | 6 +++++-
 tests/tk.test  | 5 ++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/tk.n b/doc/tk.n
index 5de1e08..ad82002 100644
--- a/doc/tk.n
+++ b/doc/tk.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: tk.n,v 1.3 1999/12/16 21:57:12 hobbs Exp $
+'\" RCS: @(#) $Id: tk.n,v 1.4 2000/10/31 00:52:11 hobbs Exp $
 '\" 
 .so man.macros
 .TH tk n 8.3 Tk "Tk Built-In Commands"
@@ -76,7 +76,7 @@ some locales (ie: Japanese, Korean), to handle special input devices.  This
 feature is only significant on X.  If XIM support is not available, this
 will always return 0.  If the \fIwindow\fR argument is omitted, it defaults
 to the main window.  If the \fIboolean\fR argument is omitted, the current
-state is returned.
+state is returned.  This is turned on by default for the main display.
 .VE
 .SH KEYWORDS
 application name, send
diff --git a/library/tk.tcl b/library/tk.tcl
index 2e872a9..0ad077e 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -3,7 +3,7 @@
 # Initialization script normally executed in the interpreter for each
 # Tk-based application.  Arranges class bindings for widgets.
 #
-# RCS: @(#) $Id: tk.tcl,v 1.25 2000/09/30 18:00:12 drh Exp $
+# RCS: @(#) $Id: tk.tcl,v 1.26 2000/10/31 00:52:11 hobbs Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -33,6 +33,10 @@ if {[info exists auto_path] && [string compare {} $tk_library] && \
 
 set tk_strictMotif 0
 
+# Turn on useinputmethods (X Input Methods) by default.
+
+tk useinputmethods 1
+
 # Create a ::tk namespace
 
 namespace eval ::tk {
diff --git a/tests/tk.test b/tests/tk.test
index bfd0cf8..a48716a 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: tk.test,v 1.4 1999/12/16 21:58:29 hobbs Exp $
+# RCS: @(#) $Id: tk.test,v 1.5 2000/10/31 00:52:11 hobbs Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -101,9 +101,8 @@ test tk-4.6 {tk command: useinputmethods: set new} {unixOnly} {
     if {[tk useinputmethods 1] == 0} {
 	puts "this wish doesn't have XIM (X Input Methods) support"
     }
-    # We should always start with XIM support off
     set useim
-} 0
+} $useim
 test tk-4.7 {tk command: useinputmethods: set new} {macOrPc} {
     # Mac and Windows don't have X Input Methods, so this should
     # always return 0
-- 
cgit v0.12