nagai	2008-05-30 11:31:17 +0900 (Fri, 30 May 2008)

  New Revision: 16702

  Modified files:
    branches/ruby_1_8/ext/tk/sample/demos-en/widget
    branches/ruby_1_8/ext/tk/sample/demos-jp/widget

  Log:
    * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: 
      commit wrong version of code at the last commitment. sorry.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/tk/sample/demos-jp/widget?r1=16702&r2=16701&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/tk/sample/demos-en/widget?r1=16702&r2=16701&diff_format=u

Index: ruby_1_8/ext/tk/sample/demos-jp/widget
===================================================================
--- ruby_1_8/ext/tk/sample/demos-jp/widget	(revision 16701)
+++ ruby_1_8/ext/tk/sample/demos-jp/widget	(revision 16702)
@@ -864,10 +864,21 @@
         TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
       }
     end
+
+    btag = TkBindTag.new
+
+    btag.bind('Key', $set_linenum, '%W')
+    btag.bind('Button', $set_linenum, '%W')
+
+    btags = $code_text.bindtags
+    btags.insert(btags.index($code_text.class) + 1, btag)
+    $code_text.bindtags = btags
+
   else
     $code_window.deiconify
     $code_window.raise
   end
+
   $code_window.title("Demo code: #{file}")
   $code_window.iconname(file)
 #  fid = open(file, 'r')
@@ -879,15 +890,6 @@
   #$code_text.set_insert('1.0')
   TkTextMarkInsert.new($code_text,'1.0')
 
-  btag = TkBindTag.new
-
-  btag.bind('Key', $set_linenum, '%W')
-  btag.bind('Button', $set_linenum, '%W')
-
-  btags = $code_text.bindtags
-  btags.insert(btags.index($code_text.class) + 1, btag)
-  $code_text.bindtags = btags
-
   $set_linenum.call($code_text)
 
   fid.close
@@ -954,6 +956,16 @@
     $code_window.bindinfo('Return').each{|cmd, arg|
       $code_window.bind_append('Escape', cmd, arg)
     }
+
+    btag = TkBindTag.new
+
+    btag.bind('Key', $set_linenum, '%W')
+    btag.bind('Button', $set_linenum, '%W')
+
+    btags = $code_text.bindtags
+    btags.insert(btags.index($code_text.class) + 1, btag)
+    $code_text.bindtags = btags
+
   else
     $code_window.deiconify
     $code_window.raise
@@ -966,15 +978,6 @@
   $code_text.insert('1.0', fid.read)
   TkTextMarkInsert.new($code_text,'1.0')
 
-  btag = TkBindTag.new
-
-  btag.bind('Key', $set_linenum, '%W')
-  btag.bind('Button', $set_linenum, '%W')
-
-  btags = $code_text.bindtags
-  btags.insert(btags.index($code_text.class) + 1, btag)
-  $code_text.bindtags = btags
-
   $set_linenum.call($code_text)
 
   fid.close
Index: ruby_1_8/ext/tk/sample/demos-en/widget
===================================================================
--- ruby_1_8/ext/tk/sample/demos-en/widget	(revision 16701)
+++ ruby_1_8/ext/tk/sample/demos-en/widget	(revision 16702)
@@ -826,10 +826,21 @@
         TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
       }
     end
+
+    btag = TkBindTag.new
+
+    btag.bind('Key', $set_linenum, '%W')
+    btag.bind('Button', $set_linenum, '%W')
+
+    btags = $code_text.bindtags
+    btags.insert(btags.index($code_text.class) + 1, btag)
+    $code_text.bindtags = btags
+
   else
     $code_window.deiconify
     $code_window.raise
   end
+
   $code_window.title("Demo code: #{file}")
   $code_window.iconname(file)
 #  fid = open(file, 'r')
@@ -841,16 +852,6 @@
   #$code_text.set_insert('1.0')
   TkTextMarkInsert.new($code_text,'1.0')
 
-  btag = TkBindTag.new
-
-
-  btag.bind('Key', $set_linenum, '%W')
-  btag.bind('Button', $set_linenum, '%W')
-
-  btags = $code_text.bindtags
-  btags.insert(btags.index($code_text.class) + 1, btag)
-  $code_text.bindtags = btags
-
   $set_linenum.call($code_text)
 
   fid.close
@@ -916,6 +917,17 @@
     $code_window.bindinfo('Return').each{|cmd, arg|
       $code_window.bind_append('Escape', cmd, arg)
     }
+
+    btag = TkBindTag.new
+
+    btag.bind('Key', $set_linenum, '%W')
+    btag.bind('Button', $set_linenum, '%W')
+    btag.bind('Configure', $set_linenum, '%W')
+
+    btags = $code_text.bindtags
+    btags.insert(btags.index($code_text.class) + 1, btag)
+    $code_text.bindtags = btags
+
   else
     $code_window.deiconify
     $code_window.raise
@@ -928,15 +940,6 @@
   $code_text.insert('1.0', fid.read)
   TkTextMarkInsert.new($code_text,'1.0')
 
-  btag = TkBindTag.new
-
-  btag.bind('Key', $set_linenum, '%W')
-  btag.bind('Button', $set_linenum, '%W')
-
-  btags = $code_text.bindtags
-  btags.insert(btags.index($code_text.class) + 1, btag)
-  $code_text.bindtags = btags
-
   $set_linenum.call($code_text)
 
   fid.close

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