* ext/tk/lib/tcltklib : bug fix

* ext/tk/lib/tk : bug fix and add Tcl/Tk extension support libraries


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

6 files changed, 13 insertions, 7 deletions

diff --git a/ext/tk/sample/demos-en/paned2.rb b/ext/tk/sample/demos-en/paned2.rb
index c8c5abb470..53c19c0ffa 100644
--- a/ext/tk/sample/demos-en/paned2.rb
+++ b/ext/tk/sample/demos-en/paned2.rb
@@ -75,7 +75,7 @@ TkPanedwindow.new($paned2_demo, :orient=>:vertical){|f|
 	}
       }, 
 
-      TkFrame.new(f) {|paned2_bottom|
+      TkFrame.new(f, :height=>120) {|paned2_bottom|
 	# The bottom window is a text widget with scrollbar
 	paned2_xscr = TkScrollbar.new(paned2_bottom)
 	paned2_yscr = TkScrollbar.new(paned2_bottom)
diff --git a/ext/tk/sample/demos-jp/entry3.rb b/ext/tk/sample/demos-jp/entry3.rb
index f0e9bc868b..4dff97a93a 100644
--- a/ext/tk/sample/demos-jp/entry3.rb
+++ b/ext/tk/sample/demos-jp/entry3.rb
@@ -64,7 +64,7 @@ TkFrame.new($entry3_demo){|f|
 # count -	Counter to control the number of times flashed
 def focusAndFlash(widget, fg, bg, count=5)
   return if count <= 0
-  TkTimer.new(200, count, 
+  TkTimer.new(100, count, 
 	      proc{widget.configure(:foreground=>bg, :background=>fg)}, 
 	      proc{widget.configure(:foreground=>fg, :background=>bg)}
 	      ).start
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
index 08598f88f8..e2f477da8b 100644
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ b/ext/tk/sample/demos-jp/menu8x.rb
@@ -173,7 +173,8 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
   TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
     m.add('cascade', 'label'=>'Icons', 'menu'=>icon_menu, 'underline'=>0)
     add('command', 
-	'bitmap'=>'@'+[$demo_dir,'images','pattern.bmp'].join(File::Separator),
+	'bitmap'=>'@'+[$demo_dir,'..',
+	                'images','pattern.xbm'].join(File::Separator),
 	'hidemargin'=>1, 
 	'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
 				     'text'=>'今あなたが選択したメニューの項目はテキストではなくビットマップを表示していました。それ以外の点では他のメニュー項目と変わりません。',
diff --git a/ext/tk/sample/demos-jp/paned2.rb b/ext/tk/sample/demos-jp/paned2.rb
index b0261d50f0..c6b0f06914 100644
--- a/ext/tk/sample/demos-jp/paned2.rb
+++ b/ext/tk/sample/demos-jp/paned2.rb
@@ -78,7 +78,7 @@ TkPanedwindow.new($paned2_demo, :orient=>:vertical){|f|
 	}
       }, 
 
-      TkFrame.new(f) {|paned2_bottom|
+      TkFrame.new(f, :height=>120) {|paned2_bottom|
 	# The bottom window is a text widget with scrollbar
 	paned2_xscr = TkScrollbar.new(paned2_bottom)
 	paned2_yscr = TkScrollbar.new(paned2_bottom)
diff --git a/ext/tk/sample/tkcombobox.rb b/ext/tk/sample/tkcombobox.rb
index f0cbdac3ba..61ab254691 100644
--- a/ext/tk/sample/tkcombobox.rb
+++ b/ext/tk/sample/tkcombobox.rb
@@ -62,6 +62,9 @@ EOD
     delegate('relief', @frame)
     delegate('borderwidth', @frame)
 
+    delegate_alias('arrowrelief', 'relief', @up_arrow, @down_arrow)
+    delegate_alias('arrowborderwidth', 'borderwidth', @up_arrow, @down_arrow)
+
     scrollbar(keys.delete('scrollbar')){false}
 
     configure keys unless keys.empty?
@@ -324,6 +327,9 @@ EOD
     delegate('relief', @frame)
     delegate('borderwidth', @frame)
 
+    delegate('arrowrelief', @lst)
+    delegate('arrowborderwidth', @lst)
+
     if mode = keys.delete('scrollbar')
       scrollbar(mode)
     end
@@ -391,6 +397,7 @@ end
 if __FILE__ == $0
   v = TkVariable.new
   e = TkCombobox.new(:height=>7, :scrollbar=>true, :textvariable=>v, 
+		     :arrowrelief=>:flat, :arrowborderwidth=>0, 
 		     :startwait=>400, :interval=>200).pack
   e.values(%w(aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu))
   #e.see(e.list_index('end') - 2)
diff --git a/ext/tk/sample/tkmultilistbox.rb b/ext/tk/sample/tkmultilistbox.rb
index 257cf95c39..c3787a0cf0 100644
--- a/ext/tk/sample/tkmultilistbox.rb
+++ b/ext/tk/sample/tkmultilistbox.rb
@@ -109,9 +109,7 @@ class TkMultiListbox < TkListbox
 	@v_scroll.set first, last
       }
     }
-#    @v_scroll.command proc{|*args| @lbox_list.each{|lbox| lbox.yview *args} }
-    @v_scroll.command proc{|*args| p "";p [@lbox_list, args]; @lbox_list.each{|lbox| lbox.yview *args} }
-#    @v_scroll.command proc{|*args| p "";p [@lbox_list, args]; @lbox_list.each{|lbox| lbox.yview *args}; p [@lbox_list, args] }
+    @v_scroll.command proc{|*args| @lbox_list.each{|lbox| lbox.yview *args} }
 
     # binding for listboxes
     @mode = {}