From ea03c3fc2c0bfcf6351c3bce9496fd4607f4594a Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 5 Nov 2003 14:00:11 +0000
Subject: configure.in, eval.c, signal.c: : add '--with-pthread-ext' option    
     to fix the pthread trouble on 'tcltklib' ext/tcltklib/README.1st: add the
 description of '--with-pthread-ext' ext/tk/lib/tktext.rb : add
 TkText#text_copy, text_cut, text_paste to         support Tcl/Tk8.4's
 tk_textCopy, tk_textCut, tk_textPaste ext/tk/lib/tk.rb : add TkMenu#set_focus
 support Tcl/Tk's tk_menuSetFocus

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tcltklib/README.1st |  7 +++++++
 ext/tk/lib/tk.rb        |  7 +++++++
 ext/tk/lib/tktext.rb    | 15 +++++++++++++++
 3 files changed, 29 insertions(+)

(limited to 'ext')

diff --git a/ext/tcltklib/README.1st b/ext/tcltklib/README.1st
index 14c56fd410..fe965e04d0 100644
--- a/ext/tcltklib/README.1st
+++ b/ext/tcltklib/README.1st
@@ -29,5 +29,12 @@ directry of Ruby sources, please try something like as the followings.
  $ rm Makefile
  $ CONFIGURE_ARGS='--with-tcl-include=/usr/local/include/tcl8.3/ --with-tcllib=tcl8.3 --with-tklib=tk8.3 --enable-tcltk_stubs' ruby extconf.rb
 
+
+ *** ATTENTION ***
+If your Tcl/Tk libraries are compiled with "pthread support", Ruby/Tk
+may cause "Hang-up" or "Segmentation Fault" frequently. To avoid this 
+trouble, please try to use the '--with-pthread-ext' option of the 
+'configure' command and re-compile Ruby sources.
+
 ==========================================================
                 Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 9cdd3b918e..e5d1c6f63b 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4289,6 +4289,10 @@ class TkWindow<TkObject
     self
   end
 
+  def caret(keys=nil)
+    TkXIM.caret(path, keys)
+  end
+
   def destroy
     super
     children = []
@@ -5400,6 +5404,9 @@ class TkMenu<TkWindow
     configure_cmd 'postcommand', cmd
     self
   end
+  def set_focus
+    tk_call('tk_menuSetFocus', path)
+  end
   def tearoffcommand(cmd=Proc.new)
     configure_cmd 'tearoffcommand', cmd
     self
diff --git a/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb
index 109afad924..8ab57d8065 100644
--- a/ext/tk/lib/tktext.rb
+++ b/ext/tk/lib/tktext.rb
@@ -284,6 +284,21 @@ class TkText<TkTextWin
     self
   end
 
+  def text_copy
+    # Tk8.4 feature
+    tk_call('tk_textCopy', @path)
+  end
+
+  def text_cut
+    # Tk8.4 feature
+    tk_call('tk_textCut', @path)
+  end
+
+  def text_paste
+    # Tk8.4 feature
+    tk_call('tk_textPaste', @path)
+  end
+
   def tag_add(tag, index1, index2=None)
     tk_send 'tag', 'add', tag, index1, index2
     self
-- 
cgit v1.2.3