Merge from ruby_1_8. Add files that have not been added yet.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/ext/tk/sample/demos-jp/labelframe.rb b/ext/tk/sample/demos-jp/labelframe.rb
index f16b601ffd..11b0d27308 100644
--- a/ext/tk/sample/demos-jp/labelframe.rb
+++ b/ext/tk/sample/demos-jp/labelframe.rb
@@ -19,8 +19,10 @@ $labelframe_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
+
 # Some information
-TkLabel.new($labelframe_demo, 
+TkLabel.new(base_frame, 
             :font=>$font, :wraplength=>'4i', :justify=>:left, 
             :text=><<EOL).pack(:side=>:top)
 TkLabelFrame ウィジェットは関連する widget 
@@ -36,7 +38,7 @@ labelframe ウィジェットを実装していない
 EOL
 
 # The bottom buttons
-TkFrame.new($labelframe_demo){|f|
+TkFrame.new(base_frame){|f|
   pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
 
   TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
@@ -50,7 +52,7 @@ TkFrame.new($labelframe_demo){|f|
 }
 
 # Demo area
-w = TkFrame.new($labelframe_demo).pack(:side=>:bottom, :fill=>:both, 
+w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both, 
                                        :expand=>true)
 
 # A group of radiobuttons in a labelframe