archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 49034: [Backport #10662]

Browse source 
* ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function
	  of tcllib. Patch by @zalt50 [fix GH-787]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-01-14 07:53:32 +00:00
parent 568a5d520b
commit 1ac6292dbe
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jan 14 16:53:14 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function
of tcllib. Patch by @zalt50 [fix GH-787]
Wed Jan 14 16:48:15 2015 Tanaka Akira <akr@fsij.org> Wed Jan 14 16:48:15 2015 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str * lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str

4
ext/tk/lib/tkextlib/tcllib/plotchart.rb
View file

@ -142,7 +142,7 @@ module Tk::Tcllib::Plotchart
end end
def self.pixel_to_coords(w, x, y) def self.pixel_to_coords(w, x, y)
list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y)) list(tk_call_without_enc('::Plotchart::pixelToCoords', w.path, x, y))
end end
def self.determine_scale(*args) # (xmin, xmax, inverted=false) def self.determine_scale(*args) # (xmin, xmax, inverted=false)
@ -311,7 +311,7 @@ module Tk::Tcllib::Plotchart
end end
def pixel_to_coords(x, y) def pixel_to_coords(x, y)
list(tk_call_without_enc('::Plotchart::coordsToPixel', @path, x, y)) list(tk_call_without_enc('::Plotchart::pixelToCoords', @path, x, y))
end end
def determine_scale(xmax, ymax) def determine_scale(xmax, ymax)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2015-01-14" #define RUBY_RELEASE_DATE "2015-01-14"
#define RUBY_PATCHLEVEL 613 #define RUBY_PATCHLEVEL 614
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1