* ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb: tk::treectrl uses 'afterId'

  not 'afterID'.

* ext/tk/sample/tkextlib/treectrl/random.rb: ditto.

* ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb: item_firstchild can
  return empty string. (drag onto leaf node)

* ext/tk/sample/tkextlib/treectrl/random.rb: ditto.

* ext/tk/sample/tkextlib/treectrl/random.rb: comparation failed at Enumerable#find
  because of type mismatch. (ex: "10" != 10)

* ext/tk/sample/tkextlib/treectrl/random.rb: and some fixes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 9 deletions

diff --git a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb b/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
index b2f5f45759..6aec944ae9 100644
--- a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
+++ b/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
@@ -172,11 +172,11 @@ def demoOutlookNewsgroup(t)
                 proc{|w|
                   if w.selection_count == 1
                     # One item is selected
-                    if @Message[:afterID][:id]
-                      Tk.after_cancel(@Message[:afterID][:id]) 
+                    if @Message[:afterId][:id]
+                      Tk.after_cancel(@Message[:afterId][:id]) 
                     end
-                    @Message[:afterID][:item] = w.selection_get[0]
-                    @Message[:afterID][:id] = Tk.after(500, proc{
+                    @Message[:afterId][:item] = w.selection_get[0]
+                    @Message[:afterId][:id] = Tk.after(500, proc{
                                                          messageReadDelayed(w)
                                                        })
                   end
@@ -184,8 +184,8 @@ def demoOutlookNewsgroup(t)
 end
 
 def messageReadDelayed(t)
-  @Message[:afterID].delete(:id)
-  i = @Message[:afterID][:item]
+  @Message[:afterId].delete(:id)
+  i = @Message[:afterId][:item]
   return unless t.selection_includes(i)
 
   # This message is not read
@@ -432,10 +432,11 @@ def demoOutlookNewsgroup2(t)
 end
 
 def anyUnreadDescendants(t, i)
-  itemList = [ t.item_firstchild(i) ]
-  while(itemList.length > 0)
-    item = itemList.pop
+  itemList = []
+  item = t.item_firstchild(i)
+  itemList.push(item) if item != ''
 
+  while item = itemList.pop
     return true unless @Message[:read][item]
 
     item2 = t.item_nextsibling(item)