git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
a_matsuda 2015-12-27 09:57:30 +00:00
Родитель 73a37eb325
Коммит 97d1dbada3
17 изменённых файлов: 20 добавлений и 20 удалений

Просмотреть файл

@ -1619,7 +1619,7 @@ def search_X_libraries
puts("Can't find X11 libraries. ")
if use_tkConfig &&
TkConfig_Info['TK_XLIBSW'] && !TkConfig_Info['TK_XLIBSW'].strip.empty?
puts("But, try to use TK_XLIBSW information (believe tkCOnfig.sh).")
puts("But, try to use TK_XLIBSW information (believe tkConfig.sh).")
($libs ||= "") << " " << TkConfig_Info['TK_XLIBSW'] << " "
else
puts("So, can't make tcltklib.so which is required by Ruby/Tk.")

Просмотреть файл

@ -162,7 +162,7 @@ class TkFont
end
def dup
fail RuntimeError, "cannot dupulicate a descendant font"
fail RuntimeError, "cannot duplicate a descendant font"
end
def clone
fail RuntimeError, "cannot clone a descendant font"

Просмотреть файл

@ -27,7 +27,7 @@ msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
justify 'left'
text "This window shows three ways of using bitmaps or images in radiobuttons and checkbuttons. On the left are two radiobuttons, each of which displays a bitmap and an indicator. In the middle is a checkbutton that displays a different image depending on whether it is selected or not. On the right is a checkbutton that displays a single bitmap but changes its background color to indicate whether or not it is selected. (This change is visible when the mouse pointer is not directy over the button.)"
text "This window shows three ways of using bitmaps or images in radiobuttons and checkbuttons. On the left are two radiobuttons, each of which displays a bitmap and an indicator. In the middle is a checkbutton that displays a different image depending on whether it is selected or not. On the right is a checkbutton that displays a single bitmap but changes its background color to indicate whether or not it is selected. (This change is visible when the mouse pointer is not directly over the button.)"
}
msg.pack('side'=>'top')

Просмотреть файл

@ -189,7 +189,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
'message'=>'The menu entry you invoked'+
'displays both a bitmap and '+
'a text string. Other than '+
'this, it isjust like any '+
'this, it is just like any '+
'other menu entry.',
'buttons'=>['OK'], 'bitmap'=>'')
})

Просмотреть файл

@ -220,7 +220,7 @@ available display styles are:
insert('end', "which results in relatively large gaps between ", style_tag_spacing)
insert('end', "the paragraphs. Spacing2 is set to 2 points, ", style_tag_spacing)
insert('end', "which results in just a bit of extra space ", style_tag_spacing)
insert('end', "within a pararaph. Spacing3 isn't used ", style_tag_spacing)
insert('end', "within a paragraph. Spacing3 isn't used ", style_tag_spacing)
insert('end', "in this example.\n", style_tag_spacing)
insert('end', "To see where the space is, select ranges of ", style_tag_spacing)
insert('end', "text within these paragraphs. The selection ", style_tag_spacing)

Просмотреть файл

@ -23,7 +23,7 @@ if Tk.windowingsystem != 'aqua'
:text=>Tk::UTF8_String.new(<<EOL))
This is a demonstration of how to do \
a toolbar that is styled correctly \
and which can be torn off (this feature reqrires Tcl/Tk8.5). \
and which can be torn off (this feature requires Tcl/Tk8.5). \
The buttons are configured to be \\u201Ctoolbar style\\u201D buttons by \
telling them that they are to use the Toolbutton style. At the left \
end of the toolbar is a simple marker that the cursor changes to a \

Просмотреть файл

@ -403,7 +403,7 @@ end
def quit(canvas)
ret = Tk.messageBox(:icon=>'warning', :type=>'okcancel',
:default=>'cancel',
:message=>'Realy quit? ')
:message=>'Really quit? ')
exit if ret == 'ok'
end

Просмотреть файл

@ -17,8 +17,8 @@ unless (wish = TkWinfo.interps.find{|ip| ip =~ /^wish/})
end
ip = RemoteTkIp.new(wish)
ip.eval_proc{TkButton.new(:command=>proc{puts 'This procesure is on the controller-ip (Ruby/Tk)'}, :text=>'print on Ruby/Tk (controller-ip)').pack(:fill=>:x)}
ip.eval_proc{TkButton.new(:command=>'puts {This procesure is on the remote-ip (wish)}', :text=>'print on wish (remote-ip)').pack(:fill=>:x)}
ip.eval_proc{TkButton.new(:command=>proc{puts 'This procedure is on the controller-ip (Ruby/Tk)'}, :text=>'print on Ruby/Tk (controller-ip)').pack(:fill=>:x)}
ip.eval_proc{TkButton.new(:command=>'puts {This procedure is on the remote-ip (wish)}', :text=>'print on wish (remote-ip)').pack(:fill=>:x)}
# If your remote-ip is Ruby/Tk, you can control the remote Ruby by
# 'ruby' or 'ruby_eval' or 'ruby_cmd' on the Tk interpreter.

Просмотреть файл

@ -20,13 +20,13 @@ btns = []
ip.eval_proc{
btns <<
TkButton.new(:command=>proc{
puts 'This procesure is on the controller-ip (Ruby-side)'
puts 'This procedure is on the controller-ip (Ruby-side)'
},
:text=>'print on controller-ip (Ruby-side)').pack(:fill=>:x)
btns <<
TkButton.new(:command=>
'puts {This procesure is on the remote-ip (Tk-side)}',
'puts {This procedure is on the remote-ip (Tk-side)}',
:text=>'print on remote-ip (Tk-side)').pack(:fill=>:x)
btns <<

Просмотреть файл

@ -40,7 +40,7 @@ class BLT_Calendar_sample
['June', 30],
['July', 31],
['August', 31],
['Septembar', 30],
['September', 30],
['October', 31],
['November', 30],
['December', 31]

Просмотреть файл

@ -88,7 +88,7 @@ module DemoManager
[pane1, pane2].each{|pane|
sw = Tk::BWidget::ScrolledWindow.new(pane)
lb = TkListbox.new(sw, :height=>8, :width=>20, :highlightthickness=>0)
(1..8).each{|i| lb.insert('end', "Valur #{i}") }
(1..8).each{|i| lb.insert('end', "Value #{i}") }
sw.set_widget(lb)
sw.pack(:fill=>:both, :expand=>true)
}

Просмотреть файл

@ -21,7 +21,7 @@ my_date1.trace('w'){
df = Tk::Tcllib::Datefield.new(:textvariable=>my_date1)
Tk.grid(TkLabel.new(:text=>'Enter a date:', :anchor=>:e), df, :sticky=>:ew)
Tk.grid(TkLabel.new(:text=>'That date ia a:', :anchor=>:e),
Tk.grid(TkLabel.new(:text=>'That date is a:', :anchor=>:e),
TkLabel.new(:textvariable=>my_date2, :relief=>:sunken, :width=>12),
:sticky=>:ew)

Просмотреть файл

@ -62,7 +62,7 @@ steps << proc{
}
steps << proc{
puts 'Paint the backgound.'
puts 'Paint the background.'
st[:fill] = 'yellow'
}

Просмотреть файл

@ -6,7 +6,7 @@ require 'tkextlib/vu/charts'
#---USAGE
info = "...the heart of a Realtime Oscilloscope, where the PCIs
joystick port gives 4 digtal inputs and 4 analog 8 bit
joystick port gives 4 digital inputs and 4 analog 8 bit
values with an resolution of ~1 millisecond (!!!)
running Realtime Linux.
<p> creates DEMO.ps

Просмотреть файл

@ -41,7 +41,7 @@ print "ip.eval_proc{$SAFE} ==> ", ip.eval_proc{$SAFE}, "\n"
print "\ncall 'ip.wait_on_mainloop = false'\n"
print "If 'ip.wait_on_mainloop? == true', ",
"when 'mainloop' is called on 'ip.eval_proc', ",
"'ip.eval_proc' does't return while the root window exists.\n",
"'ip.eval_proc' doesn't return while the root window exists.\n",
"If you want to avoid that, set wait_on_mainloop to false. ",
"Then the mainloop in the eval_proc returns soon ",
"and the following steps are evaluated. \n",
@ -59,7 +59,7 @@ ret = ip.eval_proc{
load file
}
print "\nip.eval_proc{}, which includes insecure operiation in the given block, returns an exception object: ", ret.inspect, "\n"
print "\nip.eval_proc{}, which includes insecure operation in the given block, returns an exception object: ", ret.inspect, "\n"
print "If a proc object is given, the proc is evaluated on the safe-level which is kept on the proc :: ip.eval_proc( proc{$SAFE} ) ==> ", ip.eval_proc(proc{$SAFE}), "\n"

Просмотреть файл

@ -512,7 +512,7 @@ class TkTextIO < TkText
end
def ioctrl(*args)
fail NotImplementedError, 'iocntl is not implemented on TkTextIO'
fail NotImplementedError, 'ioctrl is not implemented on TkTextIO'
end
def isatty

Просмотреть файл

@ -8626,7 +8626,7 @@ ip_invoke_core(interp, argc, argv)
#else
char **unknown_argv;
#endif
DUMP1("find 'unknown' command -> set arguemnts");
DUMP1("find 'unknown' command -> set arguments");
unknown_flag = 1;
#if TCL_MAJOR_VERSION >= 8