summaryrefslogtreecommitdiff
path: root/ext/tk/sample/demos-en
diff options
context:
space:
mode:
Diffstat (limited to 'ext/tk/sample/demos-en')
-rw-r--r--ext/tk/sample/demos-en/rmt23
-rw-r--r--ext/tk/sample/demos-en/rolodex8
-rw-r--r--ext/tk/sample/demos-en/rolodex-j9
-rw-r--r--ext/tk/sample/demos-en/square11
-rw-r--r--ext/tk/sample/demos-en/tcolor18
-rw-r--r--ext/tk/sample/demos-en/timer20
6 files changed, 60 insertions, 29 deletions
diff --git a/ext/tk/sample/demos-en/rmt b/ext/tk/sample/demos-en/rmt
index d4b1d93760..73f631180a 100644
--- a/ext/tk/sample/demos-en/rmt
+++ b/ext/tk/sample/demos-en/rmt
@@ -53,10 +53,8 @@ class Rmt
# Create text window and scrollbar.
- @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {|t|
- TkScrollbar.new(root, 'command'=>proc{|*args| t.yview *args}) {
- pack('side'=>'right', 'fill'=>'both')
- }
+ @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
+ yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
pack('side'=>'left')
}
@@ -247,13 +245,18 @@ class Rmt
rescue
end
TkWinfo.interps.sort.each{|ip|
- if Tk.appsend(ip, false, 'info commands ruby') == ""
- mode = 'Tcl'
- else
- mode = 'Ruby'
+ begin
+ if Tk.appsend(ip, false, 'info commands ruby') == ""
+ mode = 'Tcl'
+ else
+ mode = 'Ruby'
+ end
+ menu.add('command', 'label'=>format("%s (#{mode}/Tk)", ip),
+ 'command'=>proc{win.newApp ip, mode})
+ rescue
+ menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
+ 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
end
- menu.add('command', 'label'=>format("%s (#{mode}/Tk)", ip),
- 'command'=>proc{win.newApp ip, mode})
}
menu.add('command', 'label'=>format("local (Ruby/Tk)"),
'command'=>proc{win.newApp 'local', 'Ruby'})
diff --git a/ext/tk/sample/demos-en/rolodex b/ext/tk/sample/demos-en/rolodex
index 84254d93bf..9a4030e902 100644
--- a/ext/tk/sample/demos-en/rolodex
+++ b/ext/tk/sample/demos-en/rolodex
@@ -4,7 +4,7 @@
# This script is a part of Tom LaStrange's rolodex
#
# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "98/07/20 12:00:02 ttate"
+# Time-stamp: "03/08/02 06:23:06 nagai"
#
require "tk"
@@ -176,8 +176,8 @@ end
class Rolodex < TkRoot
attr_reader :frame, :buttons, :menu
- def initialize
- super
+ def initialize(*args)
+ super(*args)
@frame = RolodexFrame.new(self)
@frame.pack("side"=>"top",
"fill"=>"y",
@@ -314,7 +314,7 @@ Ctrl+S: Search (dummy operation)
EOF
$helpTopics["version"] = <<EOF
-This is version 1.0.
+This is version 1.0.1.
EOF
Tk.mainloop
diff --git a/ext/tk/sample/demos-en/rolodex-j b/ext/tk/sample/demos-en/rolodex-j
index b0fc1d2c76..27e2bc9da0 100644
--- a/ext/tk/sample/demos-en/rolodex-j
+++ b/ext/tk/sample/demos-en/rolodex-j
@@ -4,11 +4,10 @@
# このスクリプトは Tom LaStrange の rolodex の一部です。
#
# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "98/07/20 12:00:36 ttate"
+# Time-stamp: "03/08/02 14:02:04 nagai"
#
require "tk"
-require 'tkencoding'
Tk.encoding = "euc-jp"
$font = TkFont.new('k14')
@@ -198,8 +197,8 @@ end
class Rolodex < TkRoot
attr_reader :frame, :buttons, :menu
- def initialize
- super
+ def initialize(*args)
+ super(*args)
@frame = RolodexFrame.new(self)
@frame.pack("side"=>"top",
"fill"=>"y",
@@ -318,7 +317,7 @@ Ctrl+S: 検索
EOF
$helpTopics["バージョン情報"] = <<EOF
-バージョンは 1.0 です。
+バージョンは 1.0.1e です。
EOF
Tk.mainloop
diff --git a/ext/tk/sample/demos-en/square b/ext/tk/sample/demos-en/square
index 821cd9927e..00bfde59ff 100644
--- a/ext/tk/sample/demos-en/square
+++ b/ext/tk/sample/demos-en/square
@@ -15,13 +15,20 @@ require 'tkafter'
class TkSquare<TkWindow
def create_self
- tk_call 'square', path
+ begin
+ tk_call 'square', path
+ rescue
+ STDERR.print "\nSorry. Your Tk interpreter does not contain " +
+ 'a "square" demonstration widget.' +
+ "\n ( See documents included the Tcl/Tk source archive. )\n\n"
+ exit
+ end
end
def size(amount=nil)
if amount
tk_send 'size', amount
else
- number(tk_send 'size')
+ number(tk_send('size'))
end
end
def position(x,y)
diff --git a/ext/tk/sample/demos-en/tcolor b/ext/tk/sample/demos-en/tcolor
index 8750d15c3e..6d023f0f8b 100644
--- a/ext/tk/sample/demos-en/tcolor
+++ b/ext/tk/sample/demos-en/tcolor
@@ -30,6 +30,12 @@ $label2 = TkVariable.new("label2")
$label3 = TkVariable.new("label3")
+# setup the entry of the resourc database
+if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
+ TkOptionDB.add('*Entry.background', 'white')
+end
+
+
# 各イベント用のメソッド
def rgbToHsv(red,green,blue)
@@ -132,7 +138,7 @@ def tc_scaleChanged
scale2 = $root.middle.middle.scale2
scale3 = $root.middle.middle.scale3
- case $colorSpace.to_i
+ case $colorSpace.value.intern
when :rgb
$red = (scale1.get * 65.535).to_i
$green = (scale2.get * 65.535).to_i
@@ -167,7 +173,7 @@ def tc_setScales
scale2 = $root.middle.middle.scale2
scale3 = $root.middle.middle.scale3
- case $colorSpace.to_i
+ case $colorSpace.value.intern
when :rgb
scale1.set($red / 65.535)
scale2.set($green / 65.535)
@@ -289,7 +295,7 @@ class TkColorMenuFrame<TkFrame
"command" => proc{changeColorSpace(:hsb)}
add "separator"
add "radio",
- "label" => "Qutomatic updates",
+ "label" => "Automatic updates",
"variable" => $autoUpdate,
"value" => "1",
"underline" => "0"
@@ -367,7 +373,7 @@ class TkColorMiddleLeftFrame<TkFrame
"relief"=>"sunken",
"borderwidth"=>"2",
"exportselection"=>"false")
- @scroll.command(proc{|*args| @names.yview *args})
+ @scroll.command(proc{|*args| @names.yview(*args)})
@names.bind("Double-1",proc{
tc_loadNamedColor(@names.get(@names.curselection))})
@names.pack("side"=>"left")
@@ -490,8 +496,8 @@ end
class TkColor<TkRoot
attr_reader :menu, :bottom, :middle
- def initialize
- super
+ def initialize(*args)
+ super(*args)
@menu = TkColorMenuFrame.new(self)
@menu.pack("side"=>"top", "fill"=>"x")
diff --git a/ext/tk/sample/demos-en/timer b/ext/tk/sample/demos-en/timer
index 896568c0bc..58a41d00c0 100644
--- a/ext/tk/sample/demos-en/timer
+++ b/ext/tk/sample/demos-en/timer
@@ -80,12 +80,28 @@ end
class ButtonFrame < TkFrame
def initialize(parent=nil,keys=nil)
super(parent,keys)
+=begin
@stop = TkButton.new(self,
'text'=>'Stop',
'command'=>proc{timer_stop})
@start = TkButton.new(self,
'text'=>'Start',
'command'=>proc{timer_start})
+=end
+ @stop = TkButton.new(self, :text=>'Stop', :state=>:disabled)
+ @start = TkButton.new(self, :text=>'Start', :state=>:normal)
+
+ @stop.command proc{
+ timer_stop
+ @start.state(:normal)
+ @stop.state(:disabled)
+ }
+ @start.command proc{
+ timer_start
+ @stop.state(:normal)
+ @start.state(:disabled)
+ }
+
@reset = TkButton.new(self,
'text'=>'Reset',
'command'=>proc{timer_reset})
@@ -99,8 +115,8 @@ end
class Timer < TkRoot
attr_reader :countframe
- def initialize
- super
+ def initialize(*args)
+ super(*args)
@countframe = CountFrame.new(self)
@buttonframe = ButtonFrame.new(self)
for f in [@buttonframe,@countframe]