* 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

1 files changed, 32 insertions, 15 deletions

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. / " +