From 3024ffdc3a5fdb115de651edae9e3d7a335a6614 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 29 Mar 2008 05:25:12 +0000
Subject: * 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
---
 ext/tk/sample/demos-en/bind.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'ext/tk/sample/demos-en/bind.rb')

diff --git a/ext/tk/sample/demos-en/bind.rb b/ext/tk/sample/demos-en/bind.rb
index b7e7122c57..5d6ec84edb 100644
--- a/ext/tk/sample/demos-en/bind.rb
+++ b/ext/tk/sample/demos-en/bind.rb
@@ -43,11 +43,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|
@@ -120,3 +120,6 @@ TkText.new($bind_demo){|t|
   TkTextMarkInsert.new(t, '0.0')
   configure('state','disabled')
 }
+
+txt.width 60
+txt.width 24
-- 
cgit v1.2.3