Scott Kostyshak
2013-Sep-01 06:45 UTC
[Rd] [PATCH] remove a duplicate tk function definition (and alphabetize)
'tkcoords' is defined twice (in the same way) in
src/library/tcltk/R/Tk.R.
Attached is a patch against r63780 that removes the duplicate
definition and alphabetizes the functions.
I've read that minor patches such as this should be sent to r-devel [1].
Scott
[1] http://permalink.gmane.org/gmane.comp.lang.r.devel/33987
--
Scott Kostyshak
Economics PhD Candidate
Princeton University
-------------- next part --------------
Index: src/library/tcltk/R/Tk.R
==================================================================---
src/library/tcltk/R/Tk.R (revision 63780)
+++ src/library/tcltk/R/Tk.R (working copy)
@@ -493,12 +493,11 @@
tkbbox <- function(widget, ...) tcl(widget, "bbox", ...)
tkcanvasx <- function(widget, ...) tcl(widget, "canvasx",
...)
tkcanvasy <- function(widget, ...) tcl(widget, "canvasy",
...)
+tkcget <- function(widget, ...) tcl(widget, "cget", ...)
tkcompare <- function(widget, ...) tcl(widget, "compare",
...)
tkconfigure <- function(widget, ...) tcl(widget, "configure",
...)
tkcoords <- function(widget, ...) tcl(widget, "coords",
...)
tkcreate <- function(widget, ...) tcl(widget, "create",
...)
-tkcget <- function(widget, ...) tcl(widget, "cget", ...)
-tkcoords <- function(widget, ...) tcl(widget, "coords",
...)
tkcurselection <- function(widget, ...) tcl(widget,
"curselection", ...)
tkdchars <- function(widget, ...) tcl(widget, "dchars",
...)
tkdebug <- function(widget, ...) tcl(widget, "debug", ...)
@@ -508,8 +507,8 @@
tkdlineinfo <- function(widget, ...) tcl(widget, "dlineinfo",
...)
tkdtag <- function(widget, ...) tcl(widget, "dtag", ...)
tkdump <- function(widget, ...) tcl(widget, "dump", ...)
+tkentrycget <- function(widget, ...) tcl(widget, "entrycget",
...)
tkentryconfigure <- function(widget, ...) tcl(widget,
"entryconfigure", ...)
-tkentrycget <- function(widget, ...) tcl(widget, "entrycget",
...)
tkfind <- function(widget, ...) tcl(widget, "find", ...)
tkflash <- function(widget, ...) tcl(widget, "flash", ...)
tkfraction <- function(widget, ...) tcl(widget, "fraction",
...)
@@ -535,11 +534,11 @@
tkmark.unset <- function(widget, ...) tcl(widget, "mark",
"unset", ...)
tkmove <- function(widget, ...) tcl(widget, "move", ...)
tknearest <- function(widget, ...) tcl(widget, "nearest",
...)
+tkpostcascade <- function(widget, ...) tcl(widget,
"postcascade", ...)
tkpost <- function(widget, ...) tcl(widget, "post", ...)
-tkpostcascade <- function(widget, ...) tcl(widget,
"postcascade", ...)
tkpostscript <- function(widget, ...) tcl(widget, "postscript",
...)
+tkscan.dragto <- function(widget, ...) tcl(widget, "scan",
"dragto", ...)
tkscan.mark <- function(widget, ...) tcl(widget, "scan",
"mark", ...)
-tkscan.dragto <- function(widget, ...) tcl(widget, "scan",
"dragto", ...)
tksearch <- function(widget, ...) tcl(widget, "search",
...)
tksee <- function(widget, ...) tcl(widget, "see", ...)
tkselect <- function(widget, ...) tcl(widget, "select",
...)
@@ -563,7 +562,6 @@
tcl(widget, "selection", "to", ...)
tkset <- function(widget, ...) tcl(widget, "set", ...)
tksize <- function(widget, ...) tcl(widget, "size", ...)
-tktoggle <- function(widget, ...) tcl(widget, "toggle",
...)
tktag.add <- function(widget, ...) tcl(widget, "tag",
"add", ...)
tktag.bind <- function(widget, ...) tcl(widget, "tag",
"bind", ...)
tktag.cget <- function(widget, ...) tcl(widget, "tag",
"cget", ...)
@@ -576,6 +574,7 @@
tktag.raise <- function(widget, ...) tcl(widget, "tag",
"raise", ...)
tktag.ranges <- function(widget, ...) tcl(widget, "tag",
"ranges", ...)
tktag.remove <- function(widget, ...) tcl(widget, "tag",
"remove", ...)
+tktoggle <- function(widget, ...) tcl(widget, "toggle",
...)
tktype <- function(widget, ...) tcl(widget, "type", ...)
tkunpost <- function(widget, ...) tcl(widget, "unpost",
...)
tkwindow.cget <- function(widget, ...) tcl(widget, "window",
"cget", ...)
Duncan Murdoch
2013-Sep-01 18:08 UTC
[Rd] [PATCH] remove a duplicate tk function definition (and alphabetize)
On 13-09-01 2:45 AM, Scott Kostyshak wrote:> 'tkcoords' is defined twice (in the same way) in src/library/tcltk/R/Tk.R. > > Attached is a patch against r63780 that removes the duplicate > definition and alphabetizes the functions. > > I've read that minor patches such as this should be sent to r-devel [1]. > > Scott > > [1] http://permalink.gmane.org/gmane.comp.lang.r.devel/33987Thanks. I would not do the alphabetization; that makes it much harder to track changes. But if tkcoords is unnecessarily duplicated, that seems like a reasonable change. Duncan Murdoch