* 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, 10 insertions, 23 deletions

diff --git a/ext/tk/sample/tkextlib/tile/toolbutton.tcl b/ext/tk/sample/tkextlib/tile/toolbutton.tcl
index 2656fff6d8..4e08034e31 100644
--- a/ext/tk/sample/tkextlib/tile/toolbutton.tcl
+++ b/ext/tk/sample/tkextlib/tile/toolbutton.tcl
@@ -4,18 +4,6 @@
 # Demonstration of custom widget styles.
 #
 
-set tile_ver [package require tile]
-if {[package vcompare $tile_ver 0.8] >= 0} {
-    set style ::ttk::style
-} {
-    set style style
-}
-if {[package vcompare $tile_ver 0.7] >= 0} {
-    set conf_subcmd configure
-} {
-    set conf_subcmd default
-}
-
 #
 # ~ BACKGROUND
 #
@@ -54,8 +42,7 @@ if {[package vcompare $tile_ver 0.7] >= 0} {
 # style; see demo.tcl.)
 #
 
-#$style theme settings "step" {
-$style theme settings "alt" {
+style theme settings "step" {
 
 #
 # First, we use [style layout] to define what elements to
@@ -64,7 +51,7 @@ $style theme settings "alt" {
 # and a label.  (See also the TScrollbar layout definition 
 # in demos/blue.tcl for a more complicated layout spec.)
 #
-    $style layout Toolbutton {
+    style layout Toolbutton {
         Toolbutton.background
         Toolbutton.border -children {
             Toolbutton.padding -children {
@@ -81,7 +68,7 @@ $style theme settings "alt" {
 # For many options (like -background), the defaults
 # inherited from the parent style are sufficient.
 #
-    $style $conf_subcmd Toolbutton -width 0 -padding 1 -relief flat -borderwidth 2
+    style default Toolbutton -width 0 -padding 1 -relief flat -borderwidth 2
 
 #
 # Finally, use [style map] to specify state-specific 
@@ -91,7 +78,7 @@ $style theme settings "alt" {
 # over the widget).  Each state-value pair is checked
 # in order, and the first matching state takes precedence.
 #
-    $style map Toolbutton -relief {
+    style map Toolbutton -relief {
 	disabled 	flat
     	selected	sunken  
 	pressed 	sunken  
@@ -106,19 +93,19 @@ $style theme settings "alt" {
 # design decisions from an aesthetic standpoint.)
 #
 if {![catch {package require tile::theme::blue}]} {
-$style theme settings "blue" {
+style theme settings "blue" {
 
     #
     # Default values:
     #
-    $style $conf_subcmd Toolbutton \
+    style default Toolbutton \
     	-width 0 -relief flat -borderwidth 2 \
 	-background #6699CC -foreground #000000 ;
 
     #
     # Configure state-specific values for -relief, as before:
     #
-    $style map Toolbutton -relief {
+    style map Toolbutton -relief {
 	disabled 	flat
     	selected	sunken  
 	pressed 	sunken  
@@ -129,8 +116,8 @@ $style theme settings "blue" {
     # Adjust the -padding at the same time, to enhance
     # the raised/sunken illusion:
     #
-    $style $conf_subcmd Toolbutton -padding 4
-    $style map Toolbutton -padding {
+    style default Toolbutton -padding 4
+    style map Toolbutton -padding {
 	disabled	{4}
 	selected	{6 6 2 2}
 	pressed		{6 6 2 2}
@@ -141,7 +128,7 @@ $style theme settings "blue" {
     # ... and change the foreground and background colors
     # when the mouse cursor is over the widget:
     #
-    $style map Toolbutton -background {
+    style map Toolbutton -background {
 	active  	#008800
     } -foreground {
 	active  	#FFFFFF