kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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_2@49080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-12-31 05:13:11 +00:00
parent 488561c655
commit 3b53af4584
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 Dec 31 14:11:58 2014 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 Dec 31 13:26:22 2014 Eric Wong <e@80x24.org>
* vm_core.h (rb_vm_living_threads_insert): preserve order

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

@ -142,7 +142,7 @@ module Tk::Tcllib::Plotchart
end
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
def self.determine_scale(*args) # (xmin, xmax, inverted=false)
@ -311,7 +311,7 @@ module Tk::Tcllib::Plotchart
end
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
def determine_scale(xmax, ymax)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2014-12-31"
#define RUBY_PATCHLEVEL 2
#define RUBY_PATCHLEVEL 3
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 12