diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-23 05:22:13 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-23 05:22:13 +0000 |
commit | 61a68941b1d22973dfb832e0575596d53f3e31b4 (patch) | |
tree | ad2e6871fc4bd6e4bfbfe2aa71b888e51a4b2261 /ext/tk/sample/demos-en/icon.rb | |
parent | 280f8df3706176fac38ef42e3fc79d30ac6e1e16 (diff) |
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
Diffstat (limited to 'ext/tk/sample/demos-en/icon.rb')
-rw-r--r-- | ext/tk/sample/demos-en/icon.rb | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/ext/tk/sample/demos-en/icon.rb b/ext/tk/sample/demos-en/icon.rb index 58aca2df07..a3921d2333 100644 --- a/ext/tk/sample/demos-en/icon.rb +++ b/ext/tk/sample/demos-en/icon.rb @@ -19,8 +19,10 @@ $icon_demo = TkToplevel.new {|w| positionWindow(w) } +base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true) + # label -msg = TkLabel.new($icon_demo) { +msg = TkLabel.new(base_frame) { font $font wraplength '5i' justify 'left' @@ -29,7 +31,7 @@ msg = TkLabel.new($icon_demo) { msg.pack('side'=>'top') # frame -TkFrame.new($icon_demo) {|frame| +TkFrame.new(base_frame) {|frame| TkButton.new(frame) { text 'Dismiss' command proc{ @@ -63,16 +65,18 @@ TkBitmapImage.new('file'=>[$demo_dir,'..', letters = TkVariable.new # frame -TkFrame.new($icon_demo, 'borderwidth'=>10){|w| +TkFrame.new(base_frame, 'borderwidth'=>10){|w| TkFrame.new(w) {|f| - TkRadioButton.new(f){ + # TkRadioButton.new(f){ + Tk::RadioButton.new(f){ bitmap '@' + [$demo_dir,'..', 'images','letters.xbm'].join(File::Separator) variable letters value 'full' }.pack('side'=>'top', 'expand'=>'yes') - TkRadioButton.new(f){ + # TkRadioButton.new(f){ + Tk::RadioButton.new(f){ bitmap '@' + [$demo_dir,'..', 'images','noletter.xbm'].join(File::Separator) variable letters @@ -81,14 +85,16 @@ TkFrame.new($icon_demo, 'borderwidth'=>10){|w| }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m') - TkCheckButton.new(w) { + # TkCheckButton.new(w) { + Tk::CheckButton.new(w) { image flagdown selectimage flagup indicatoron 0 selectcolor self['background'] }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m') - TkCheckButton.new(w) { + # TkCheckButton.new(w) { + Tk::CheckButton.new(w) { bitmap '@' + [$demo_dir,'..', 'images','letters.xbm'].join(File::Separator) indicatoron 0 |