[Sciviews-commits] r567 - in pkg/tcltk2: . R inst/tklibs/widget3.0

[noreply at r-forge.r-project.org]

Author: phgrosjean
Date: 2015-12-25 15:57:24 +0100 (Fri, 25 Dec 2015)
New Revision: 567

Modified:
   pkg/tcltk2/DESCRIPTION
   pkg/tcltk2/NEWS
   pkg/tcltk2/R/tk2commands.R
   pkg/tcltk2/inst/tklibs/widget3.0/scrollw.tcl
Log:
Bug in tcltk2 tk2list.XXX() functions produced an error with tk2comboboxes (closes #6274)

Modified: pkg/tcltk2/DESCRIPTION
===================================================================
--- pkg/tcltk2/DESCRIPTION	2015-11-22 15:06:37 UTC (rev 566)
+++ pkg/tcltk2/DESCRIPTION	2015-12-25 14:57:24 UTC (rev 567)
@@ -1,7 +1,7 @@
 Package: tcltk2
 Type: Package
-Version: 1.2-11
-Date: 2014-12-19
+Version: 1.2-12
+Date: 2015-12-10
 Title: Tcl/Tk Additions
 Author: Philippe Grosjean [aut, cre]
 Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),

Modified: pkg/tcltk2/NEWS
===================================================================
--- pkg/tcltk2/NEWS	2015-11-22 15:06:37 UTC (rev 566)
+++ pkg/tcltk2/NEWS	2015-12-25 14:57:24 UTC (rev 567)
@@ -1,5 +1,11 @@
 = tcltk2 news
 
+== Version 1.2-12
+
+* A bug led to incorrect tk2list.set(), tk2list.insert() and tk2list.delete()
+  treatment in case of tk2combobox widgets. Corrected.
+
+
 == Version 1.2-11
 
 * After a problem for active menu items not displayed in a contrasted color on

Modified: pkg/tcltk2/R/tk2commands.R
===================================================================
--- pkg/tcltk2/R/tk2commands.R	2015-11-22 15:06:37 UTC (rev 566)
+++ pkg/tcltk2/R/tk2commands.R	2015-12-25 14:57:24 UTC (rev 567)
@@ -20,7 +20,7 @@
 tk2list.set <- function (widget, items)
 {
 	## Set a list of values for a widget (e.g., combobox)
-	if (inherits(widget, "ttk2combobox")) {
+	if (inherits(widget, "tk2combobox")) {
         ## ttk::combobox uses -values parameter
         tkconfigure(widget, values = as.character(items))
     } else {
@@ -36,7 +36,7 @@
 tk2list.insert <- function (widget, index = "end", ...)
 {
 	## Insert one or more items in a list
-	if (inherits(widget, "ttk2combobox")) {
+	if (inherits(widget, "tk2combobox")) {
         ## ttk::combobox uses -values parameter
 		Items <- as.character(unlist(list(...)))
 		if (length(Items) < 1) return()	# Nothing to insert
@@ -63,7 +63,7 @@
 tk2list.delete <- function (widget, first, last = first)
 {
 	## Delete one or more items from a list
-	if (inherits(widget, "ttk2combobox")) {
+	if (inherits(widget, "tk2combobox")) {
         ## ttk::combobox uses -values parameter
 		List <- as.character(tcl(widget, "cget", "-values"))
 		if (length(List) < 2 && List == "") return(List)	# The list in empty

Modified: pkg/tcltk2/inst/tklibs/widget3.0/scrollw.tcl
===================================================================
--- pkg/tcltk2/inst/tklibs/widget3.0/scrollw.tcl	2015-11-22 15:06:37 UTC (rev 566)
+++ pkg/tcltk2/inst/tklibs/widget3.0/scrollw.tcl	2015-12-25 14:57:24 UTC (rev 567)
@@ -50,7 +50,8 @@
 package require tile
 
 snit::widget widget::scrolledwindow {
-    hulltype ttk::frame
+    hulltype frame
+    #hulltype ttk::frame
 
     component hscroll
     component vscroll