nagai	2008-04-11 12:45:25 +0900 (Fri, 11 Apr 2008)

  New Revision: 15969

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/tk/lib/tkextlib/tile/style.rb
    branches/ruby_1_8/ext/tk/lib/tkextlib/tile.rb

  Log:
    * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
      ext/tk/sample/tkextlib/tile/demo.rb: previous patch is not complete.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15969&r2=15968&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/tk/lib/tkextlib/tile/style.rb?r1=15969&r2=15968&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/tk/lib/tkextlib/tile.rb?r1=15969&r2=15968&diff_format=u

Index: ruby_1_8/ext/tk/lib/tkextlib/tile/style.rb
===================================================================
--- ruby_1_8/ext/tk/lib/tkextlib/tile/style.rb	(revision 15968)
+++ ruby_1_8/ext/tk/lib/tkextlib/tile/style.rb	(revision 15969)
@@ -39,6 +39,7 @@
 
           # do nothing !!!
           warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
+          return
         end
         TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
         if [string equal [lrange $args 0 1] {element create}] {
@@ -59,8 +60,12 @@
     else ### TILE_SPEC_VERSION_ID == 7
       def __define_wrapper_proc_for_compatibility__!
         unless Tk.info(:commands, '::ttk::style').empty?
-          fail RuntimeError,
-               "can't define ':ttk::style' command (already exist)"
+          # fail RuntimeError,
+          #     "can't define '::ttk::style' command (already exist)"
+
+          # do nothing !!!
+          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
+          return
         end
         TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
         if [string equal [lrange $args 0 1] {element create}] {
@@ -87,7 +92,11 @@
 
     def __define_wrapper_proc_for_compatibility__!
       unless Tk.info(:commands, '::style').empty?
-        fail RuntimeError, "can't define '::style' command (already exist)"
+        # fail RuntimeError, "can't define '::style' command (already exist)"
+
+        # do nothing !!!
+        warn "Warning: can't define '::style' command (already exist)" if $DEBUG
+        return
       end
       TkCore::INTERP.add_tk_procs('::style', 'args', <<-'EOS')
         if [string equal [lrange $args 0 1] {element create}] {
Index: ruby_1_8/ext/tk/lib/tkextlib/tile.rb
===================================================================
--- ruby_1_8/ext/tk/lib/tkextlib/tile.rb	(revision 15968)
+++ ruby_1_8/ext/tk/lib/tkextlib/tile.rb	(revision 15969)
@@ -137,6 +137,7 @@
 
           # do nothing !!!
           warn "Warning: can't define '#{cmd}' command (already exist)" if $DEBUG
+          next
         end
         TkNamespace.eval(ns){
           TkCore::INTERP.add_tk_procs(proc_name, 'imgdir {patterns {*.gif}}', 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15968)
+++ ruby_1_8/ChangeLog	(revision 15969)
@@ -1,3 +1,8 @@
+Fri Apr 11 12:43:56 2008  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
+	  ext/tk/sample/tkextlib/tile/demo.rb: previous patch is not complete.
+
 Fri Apr 11 10:22:54 2008  Hidetoshi NAGAI  <nagai@a...>
 
 	* ext/tk/lib/tkextlib/tile.rb:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/