* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.

* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets' 
  instate/state/identify method to avoid the conflict with standard
  widget options. Those methods are renamed to ttk_instate/ttk_state/
  ttk_identify (tile_instate/tile_state/tile_identify are available 
  too). Although I don't recommend, if you realy need old methods, 
  please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before 
  "require 'tkextlib/tile'".

* ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
  is obsolete. It outputs warning. To control default widget set, 
  use "Tk.default_widget_set = :Ttk".

* ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and 
  __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind 
  as module methods of TkConfigMethod. It may help users to wrap old 
  Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets.
  Ttk widgets don't have some options of standard widgets which are 
  control the view of widgets. When set ignore-mode true, configure 
  method tries to ignoure such unknown options with no exception. 
  Of course, it may raise other troubles on the GUI design. 
  So, those are a little danger methods. 

* ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ 
  method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method 
  are defind as module methods of TkItemConfigMethod as the same 
  purpose as TkConfigMethod's ones.

* ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for 
  wrapping old Ruby/Tk scripts (which use standard widgets) to use 
  Ttk (Tile) widgets as default.

* ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state 
  method instead of instate/state method.

* ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb,
  ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's  
  are replaced to "instance_exec(self)".

* ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not 
  a character code on Ruby1.9).

* ext/tk/lib/tk/variable.rb: support new style of operation argument 
  on Tcl/Tk's 'trace' command for variables. 

* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix

* ext/tk/sammple/demos-jp/textpeer.rb, 
  ext/tk/sammple/demos-en/textpeer.rb: new widget demo.

* ext/tk/tcltklib.c: decrase SEGV troubles (probably)

* ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9

* ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably)

* ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command 
  to make Tcl/Tk theme sources (based on different version of Tile 
  extension) available. 
  (Tk::Tile::__define_LoadImages_proc_for_comaptibility__)

* ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames
  (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets 
  as toplevel widgets.

* ext/tk/lib/tkextlib/tile/style.rb: ditto.
  (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__)

* ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get 
  properties as a hash. metrics_hash method returns a boolean value 
  for 'fixed' option. But metrics method returns numeric value 
  (0 or 1) for 'fixed' option, because of backward compatibility. 

* ext/tk/lib/tk/timer.rb: somtimes fail to set callback procedure.

* ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep 
  doesn't block the eventloop. It will be better to use the method 
  in event callbacks.

* ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

12 files changed, 213 insertions, 51 deletions

diff --git a/ext/tk/sample/demos-jp/arrow.rb b/ext/tk/sample/demos-jp/arrow.rb
index 43c6eef4eb..b2c1067027 100644
--- a/ext/tk/sample/demos-jp/arrow.rb
+++ b/ext/tk/sample/demos-jp/arrow.rb
@@ -74,11 +74,19 @@ def arrowSetup(c)
               'arrow'=>'both', 'arrowshape'=>v.smallTips)
   TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
 
-  TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
-              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  TkcText.new(c, v.x1, 330, 
-              'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]", 'anchor'=>'w', 
-              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+  if $tk_version =~ /^4.*/
+    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+    TkcText.new(c, v.x1, 330, 
+                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+  else
+    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
+                'font'=>'Helvetica 18')
+    TkcText.new(c, v.x1, 330, 
+                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
+                'anchor'=>'w', 'font'=>'Helvetica 18')
+  end
 
   v.count += 1
 end
diff --git a/ext/tk/sample/demos-jp/bind.rb b/ext/tk/sample/demos-jp/bind.rb
index 87b39721d1..3b6f6242c2 100644
--- a/ext/tk/sample/demos-jp/bind.rb
+++ b/ext/tk/sample/demos-jp/bind.rb
@@ -41,11 +41,11 @@ def tag_binding_for_bind_demo(tag, enter_style, leave_style)
 end
 
 # text 生成
-TkText.new($bind_demo){|t|
+txt = TkText.new($bind_demo){|t|
   # 生成
   setgrid 'true'
-  width  60
-  height 24
+  #width  60
+  #height 24
   font $font
   wrap 'word'
   TkScrollbar.new($bind_demo) {|s|
@@ -118,3 +118,6 @@ TkText.new($bind_demo){|t|
   TkTextMarkInsert.new(t, '0.0')
   configure('state','disabled')
 }
+
+txt.width 60
+txt.width 24
diff --git a/ext/tk/sample/demos-jp/ctext.rb b/ext/tk/sample/demos-jp/ctext.rb
index 35d43febbc..f5daf7ca05 100644
--- a/ext/tk/sample/demos-jp/ctext.rb
+++ b/ext/tk/sample/demos-jp/ctext.rb
@@ -53,19 +53,28 @@ $ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat',
 $ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
 
 # font 設定
-textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+if $tk_version =~ /^4.*/
+  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+else
+  textFont = 'Helvetica 24'
+end
 
 # canvas 設定
 TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
                  'outline'=>'black', 'fill'=>'red')
 
+ctag_text_param = {
+  'text'=>"これはキャンバスwidgetのテキスト機能をデモするための文字列です。\n上で述べたような編集を可能とするためのバインディングを施しています。",
+  'width'=>440, 'anchor'=>'n', 'justify'=>'left'
+}
+if $tk_version =~ /^4.*/
+  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+  ctag_text_param['kanjifont'] = '-*-r-*--24-*-jisx0208.1983-0'
+else
+  ctag_text_param['font'] = 'Helvetica 24'
+end
 $ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, 
-                               'text'=>"これはキャンバスwidgetのテキスト機能をデモするための文字列です。\n上で述べたような編集を可能とするためのバインディングを施しています。",
-                               'width'=>440, 'anchor'=>'n', 
-                               'font'=>'-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*', 
-                               'kanjifont'=>'-*-r-*--24-*-jisx0208.1983-0', 
-                               'justify'=>'left') )
+$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
 
 $ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
 $ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
@@ -107,9 +116,14 @@ mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
 item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50, 
                         'outline'=>'black', 'fill'=>'red')
 item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 'anchor'=>'s', 
-            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-            'fill'=>'brown')
+if $tk_version =~ /^4.*/
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 
+              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
+              'anchor'=>'s', 'fill'=>'brown')
+else
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 
+              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
+end
 
 # Lastly, create some items that allow the text's justification to be
 # changed.
@@ -120,9 +134,14 @@ color = 'SeaGreen2'
 mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
 mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
 mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 'anchor'=>'s', 
-            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
-            'fill'=>'brown')
+if $tk_version =~ /^4.*/
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 
+              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
+              'anchor'=>'s', 'fill'=>'brown')
+else
+  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 
+              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
+end
 
 $ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
 $ctext_canvas.itembind('config', 'Leave', 
diff --git a/ext/tk/sample/demos-jp/hscale.rb b/ext/tk/sample/demos-jp/hscale.rb
index 690479d6d1..b636f0579f 100644
--- a/ext/tk/sample/demos-jp/hscale.rb
+++ b/ext/tk/sample/demos-jp/hscale.rb
@@ -66,7 +66,6 @@ TkFrame.new($hscale_demo) {|frame|
   scale.set 75
 }.pack('side'=>'top', 'fill'=>'x')
 
-
 def setWidth(w, width)
   width = width + 21
   x2 = width - 30
diff --git a/ext/tk/sample/demos-jp/items.rb b/ext/tk/sample/demos-jp/items.rb
index d538fac75f..c173d3b57f 100644
--- a/ext/tk/sample/demos-jp/items.rb
+++ b/ext/tk/sample/demos-jp/items.rb
@@ -92,8 +92,13 @@ TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
 TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
 TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
 
-font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
+if $tk_version =~ /^4.*/
+  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
+  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
+else
+  font1 = 'Helvetica 12'
+  font2 = 'Helvetica 24 bold'
+end
 if TkWinfo.depth($root).to_i > 1
   blue   = 'DeepSkyBlue3'
   red    = 'red'
diff --git a/ext/tk/sample/demos-jp/plot.rb b/ext/tk/sample/demos-jp/plot.rb
index 09a3446836..dbca3e971c 100644
--- a/ext/tk/sample/demos-jp/plot.rb
+++ b/ext/tk/sample/demos-jp/plot.rb
@@ -42,7 +42,11 @@ $plot_buttons = TkFrame.new($plot_demo) {|frame|
 $plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # font 設定
-plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  if $tk_version =~ /^4.*/
+    plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  else
+    font = 'Helvetica 18'
+  end
 
 # canvas 設定
 $plot_canvas = TkCanvas.new($plot_demo,'relief'=>'raised','width'=>450,'height'=>300)
diff --git a/ext/tk/sample/demos-jp/search.rb b/ext/tk/sample/demos-jp/search.rb
index adb72fd809..d3692e2455 100644
--- a/ext/tk/sample/demos-jp/search.rb
+++ b/ext/tk/sample/demos-jp/search.rb
@@ -169,9 +169,14 @@ $search_text.insert('1.0', "\
 エントリに文字列を入力し、<リターン> を押すか「反転」ボタンを押してく \
 ださい。するとファイル中の、検索文字列と一致する部分に全て \"search_Tag\" \
 というタグがつけられ、タグの表示属性としてその文字列が点滅するように \
-設定されます。")
+設定されます。\n")
+$search_text.insert('end', "\
+ファイル読み込みのカレントディレクトリは \"#{Dir.pwd}\" です。\
+")
 $search_text.set_insert '0.0'
 
 $search_fileName.value = ''
 $search_searchString.value = ''
 
+$search_text.width = 60
+$search_text.height = 20
diff --git a/ext/tk/sample/demos-jp/style.rb b/ext/tk/sample/demos-jp/style.rb
index 50855a549a..c8c7850156 100644
--- a/ext/tk/sample/demos-jp/style.rb
+++ b/ext/tk/sample/demos-jp/style.rb
@@ -9,6 +9,7 @@ if defined?($style_demo) && $style_demo
   $style_demo = nil
 end
 
+
 # demo 用の toplevel widget を生成
 $style_demo = TkToplevel.new {|w|
   title("Text Demonstration - Display Styles")
@@ -16,6 +17,7 @@ $style_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+
 # frame 生成
 TkFrame.new($style_demo) {|frame|
   TkButton.new(frame) {
@@ -34,13 +36,15 @@ TkFrame.new($style_demo) {|frame|
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
+
 # text 生成
-TkText.new($style_demo){|t|
+txt = TkText.new($style_demo){|t|
   # 生成
   setgrid 'true'
-  width  70
-  height 32
+  #width  70
+  #height 32
   wrap 'word'
+  font $font
   TkScrollbar.new($style_demo) {|s|
     pack('side'=>'right', 'fill'=>'y')
     command proc{|*args| t.yview(*args)}
@@ -49,11 +53,20 @@ TkText.new($style_demo){|t|
   pack('expand'=>'yes', 'fill'=>'both')
 
   # テキストタグ設定 (フォント関連)
-  style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-  style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
+  family = 'Courier'
+
+  if $tk_version =~ /^4.*/
+    style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
+    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
     style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
+    # style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
     style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+  else
+    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
+    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
+    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
+    style_tag_small = TkTextTag.new(t, 'font'=>['Times 8 bold'])
+  end
 ###
 #  case($tk_version)
 #  when /^4.*/
@@ -107,8 +120,13 @@ TkText.new($style_demo){|t|
   style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
   style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
   style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  if $tk_version =~ /^4.*/
+    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  else
+    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
+    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
+  end
   style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
                                     'rmargin'=>'10m')
   style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
@@ -247,3 +265,5 @@ spacing3')
 
 }
 
+txt.width 70
+txt.height 32
diff --git a/ext/tk/sample/demos-jp/textpeer.rb b/ext/tk/sample/demos-jp/textpeer.rb
new file mode 100644
index 0000000000..9b2b57a698
--- /dev/null
+++ b/ext/tk/sample/demos-jp/textpeer.rb
@@ -0,0 +1,78 @@
+# -*- coding: euc-jp -*-
+#
+# text widget peering demo (called by 'widget')
+#
+# based on Tcl/Tk8.5.0 widget demos
+
+if defined?($textpeer_demo) && $textpeer_demo
+  $textpeer_demo.destroy 
+  $textpeer_demo = nil
+end
+
+# demo toplevel widget
+$textpeer_demo = TkToplevel.new {|w|
+  title("Text Wdget Peering Demonstration")
+  iconname("textpeer")
+  positionWindow(w)
+}
+
+count = [0]
+
+## Define a widget that we peer from; it won't ever actually be shown though
+first = TkText.new($textpeer_demo, :widgetname=>"text#{count[0] += 1}")
+first.insert :end,"このデモは一つの組を成したテキストウィジェットを示します。"
+first.insert :end,"それらのテキストウィジェットは対等(ピア;peer)の関係に"
+first.insert :end,"なっています。"
+first.insert :end,"それらは、基盤となるデータモデルは共通のものを持ちますが、"
+first.insert :end,"画面表示位置、編集位置、選択範囲(selection)については"
+first.insert :end,"独立に持つことができます。"
+first.insert :end,"各テキストウィジェットの脇にある"
+first.insert :end,"「ピア(peer)の作成」ボタンを使えば、"
+first.insert :end,"新たなピアを追加することが可能です。"
+first.insert :end,"また「ピア(peer)の消去」ボタンを使えば、"
+first.insert :end,"特定のピアウィジェットを消去することもできます。"
+
+## Procedures to make and kill clones; most of this is just so that the demo
+## looks nice...
+def makeClone(count, win, txt)
+  cnt = (count[0] += 1)
+  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
+  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
+  peer.yscrollbar sbar
+  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", 
+                    :text=>'ピア(peer)の作成', 
+                    :command=>proc{makeClone(count, win, peer)})
+  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", 
+                    :text=>'ピア(peer)の消去', 
+                    :command=>proc{killClone(win, cnt)})
+  row = cnt * 2
+  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
+  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
+  TkGrid.configure(b1,  b2, :sticky=>'new')
+  TkGrid.rowconfigure(win,  b2, :weight=>1)
+end
+
+def killClone(win, cnt)
+  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}", 
+             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
+end
+
+## Now set up the GUI
+makeClone(count, $textpeer_demo, first)
+makeClone(count, $textpeer_demo, first)
+first.destroy
+
+## See Code / Dismiss buttons
+TkFrame.new($textpeer_demo){|f|
+  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
+                 $textpeer_demo.destroy
+                 $textpeer_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
+                 showCode 'textpeer'
+               }).pack(:side=>:left, :expand=>true)
+
+  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
+}
+TkGrid.columnconfigure($textpeer_demo, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/twind.rb b/ext/tk/sample/demos-jp/twind.rb
index 166a44cdb2..d0fa8ca49e 100644
--- a/ext/tk/sample/demos-jp/twind.rb
+++ b/ext/tk/sample/demos-jp/twind.rb
@@ -207,7 +207,11 @@ def textWindPlot (t)
     cursor 'top_left_arrow'
   }
 
-  font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  if $tk_version =~ /^4.*/
+    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  else
+    font = 'Helvetica 18'
+  end
 
   TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
   TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
diff --git a/ext/tk/sample/demos-jp/vscale.rb b/ext/tk/sample/demos-jp/vscale.rb
index eb0cea250d..990ca43215 100644
--- a/ext/tk/sample/demos-jp/vscale.rb
+++ b/ext/tk/sample/demos-jp/vscale.rb
@@ -67,7 +67,6 @@ TkFrame.new($vscale_demo) {|frame|
   scale.set 75
 }.pack
 
-
 def setHeight(w, height)
   height = height + 21
   y2 = height - 30
@@ -77,3 +76,4 @@ def setHeight(w, height)
   w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
   w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
 end
+
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
index 7982a6651e..3eea4c7887 100644
--- a/ext/tk/sample/demos-jp/widget
+++ b/ext/tk/sample/demos-jp/widget
@@ -5,7 +5,7 @@
 if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
   $KCODE = 'euc'
 else
-  $TK_ENCODING = 'EUC-JP'
+  DEFAULT_TK_ENCODING = 'EUC-JP'
 end
 
 # tk 関係ライブラリの読み込み
@@ -13,7 +13,8 @@ require 'tk'
 # require 'tkafter'
 
 # widget demo directory 位置の獲得
-$demo_dir = File.dirname($0)
+# $demo_dir = File.dirname($0)
+$demo_dir = File.dirname(__FILE__)
 
 # root の生成
 $root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
@@ -45,18 +46,17 @@ when /^4.*/
 #  $msg_kanji_font=TkFont.new('Helvetica 16', 'Gothic 16 bold')
 
 when /^8.*/
-  $font = TkFont.new('Helvetica -12')
-  $kanji_font = TkFont.new('Helvetica -12', 'Mincho -12')
+  $font = TkFont.new('Helvetica 12')
+  $kanji_font = TkFont.new('Helvetica 12', 'Mincho 12')
   TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('Helvetica 16', 'Gothic 16 bold')
+  $msg_kanji_font=TkFont.new('Helvetica 18 bold', 'Gothic 18 bold')
 
 else
-  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
+  $font = TkFont.new('Helvetica 14', nil)
   knjfont = '-*--16-*-jisx0208.1983-0'
-  $kanji_font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
-                           knjfont)
+  $kanji_font = TkFont.new('Helvetic 14', knj)
   TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
+  $msg_kanji_font=TkFont.new('Helvetica 14',
                              '-*--24-*-jisx0208.1983-0')
 end
 #######
@@ -185,18 +185,27 @@ else
   textFrame.pack('expand'=>'yes', 'fill'=>'both')
 
   statusBar = TkFrame.new($root) {|f|
+    if $tk_version =~ /^4.*/
+      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
+    else
+      statusfont = 'Helvetica 10'
+    end
     $statusBarLabel = \
     TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+                'font'=>statusfont) \
     .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
     TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+                'font'=>statusfont) \
     .pack('side'=>'left', 'padx'=>2)
   }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
 end
 
 # テキストタグ設定
-tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
+if $tk_version =~ /^4.*/
+  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
+else
+  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
+end
 #tag_kanji_title = TkTextTag.new(txt, 'kanjifont'=>$msg_kanji_font)
 #tag_middle = TkTextTag.new(txt, 'kanjifont'=>$kanji_font)
 tag_kanji_title = TkTextTag.new(txt, 'font'=>$msg_kanji_font)
@@ -372,6 +381,8 @@ txt.insert('end', "5. ウィンドウを埋め込んだテキスト (機能に対応したバージョンの
 txt.insert('end', " \n ", tag_demospace)
 txt.insert('end', "6. 検索\n", tag_demo, "demo-search")
 txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "7. テキストウィジェットの対等化(peering) (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-textpeer")
+txt.insert('end', " \n ", tag_demospace)
 
 txt.insert('end', "\n")
 #txt.insert('end', "キャンバス\n", tag_middle)
@@ -492,7 +503,11 @@ def showVars1(parent, *args)
       text "変数値:"
       width 20
       anchor 'center'
-      font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
+      if $tk_version =~ /^4.*/
+        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
+      else
+        font 'Helvetica 14'
+      end
     }.pack('side'=>'top', 'fill'=>'x')
     len = 1
     args.each{|vnam,vbody|
@@ -639,7 +654,9 @@ end
 private :_null_binding
 
 def eval_samplecode(code)
-  Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }.run
+  #eval(code)
+  #_null_binding.pseudo_toplevel_eval{ eval(code) }
+  Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
   Tk.update
 end
 
@@ -931,7 +948,7 @@ end
 #
 def aboutBox
   Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
-                'message'=>"Ruby/Tk ウィジェットデモ Ver.1.6.0-jp\n\n" + 
+                'message'=>"Ruby/Tk ウィジェットデモ Ver.1.6.3-jp\n\n" + 
                            "based on demos of Tk8.1 -- 8.5  " + 
                            "( Copyright:: " + 
                            "(c) 1996-1997 Sun Microsystems, Inc. / " +