From ffcedd79505ea2e99f859c7cea2fb2221c948d4c Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 1 Jul 2004 09:38:48 +0000
Subject: * 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/trunk@6559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/sample/demos-jp/entry3.rb | 2 +-
 ext/tk/sample/demos-jp/menu8x.rb | 3 ++-
 ext/tk/sample/demos-jp/paned2.rb | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'ext/tk/sample/demos-jp')

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)
-- 
cgit v1.2.3