[Sciviews-commits] r234 - in pkg: svSocket tcltk2 tcltk2/R

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

Author: phgrosjean
Date: 2009-12-12 12:00:02 +0100 (Sat, 12 Dec 2009)
New Revision: 234

Modified:
   pkg/svSocket/TODO
   pkg/tcltk2/DESCRIPTION
   pkg/tcltk2/NEWS
   pkg/tcltk2/R/tcltk2-Internal.R
   pkg/tcltk2/TODO
Log:
Bug correction in tcltk2 tk2mclistbox row selection

Modified: pkg/svSocket/TODO
===================================================================
--- pkg/svSocket/TODO	2009-11-30 23:46:47 UTC (rev 233)
+++ pkg/svSocket/TODO	2009-12-12 11:00:02 UTC (rev 234)
@@ -1,5 +1,9 @@
 = svSocket To Do list
 
+* Rework the mechanism to add history item to R from within Komodo
+
+* Eliminate the need to poll R regularly (for menu items activating/deactivating)
+
 * svSocket-package.Rd man page
 
 * Easy redefinition of options(width = ...) to adjust width of output to the

Modified: pkg/tcltk2/DESCRIPTION
===================================================================
--- pkg/tcltk2/DESCRIPTION	2009-11-30 23:46:47 UTC (rev 233)
+++ pkg/tcltk2/DESCRIPTION	2009-12-12 11:00:02 UTC (rev 234)
@@ -8,8 +8,8 @@
 Description: A series of additional Tcl commands and Tk widgets with style
   and various functions (under Windows: DDE exchange, access to the
   registry and icon manipulation) to supplement the tcltk package
-Version: 1.1-0
-Date: 2009-07-02
+Version: 1.1-1
+Date: 2009-12-12
 Author: Philippe Grosjean
 Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: file LICENSE

Modified: pkg/tcltk2/NEWS
===================================================================
--- pkg/tcltk2/NEWS	2009-11-30 23:46:47 UTC (rev 233)
+++ pkg/tcltk2/NEWS	2009-12-12 11:00:02 UTC (rev 234)
@@ -1,5 +1,12 @@
 = tcltk2 news
 
+== Version 1.1-1
+
+* A bug in tk2mclistbox, clailing for missing -state argument when selecting
+  an item in the box is corrected, thanks to a patch provided by Christiane
+  Raemsch (and slightly modified).
+  
+
 == Version 1.1-0
 
 * Several Tcl packages are added, or upgraded:

Modified: pkg/tcltk2/R/tcltk2-Internal.R
===================================================================
--- pkg/tcltk2/R/tcltk2-Internal.R	2009-11-30 23:46:47 UTC (rev 233)
+++ pkg/tcltk2/R/tcltk2-Internal.R	2009-12-12 11:00:02 UTC (rev 234)
@@ -58,6 +58,30 @@
 #				tk2font.setstyle(system = TRUE, default.styles = TRUE, text = TRUE)
 				### TODO: reflect possible changes to other graphical toolkits (how?)
 				### TODO: homogenize R console, R graph, SciTe fonts with these fonts
+		} else {	# There is a bug in mclistbox with Tcl/Tk 8.5
+			# Patch by Christiane Raemsch, slightly modified by Ph. Grosjean
+			# This is essentially the listbox procedure, but with an additional
+			# focus argument required by mclistbox
+			.Tcl('proc ::tk::ListboxBeginSelect {w el {focus 0}} {
+				variable ::tk::Priv
+				if {[$w cget -selectmode] eq "multiple"} {
+					if {[$w selection includes $el]} {
+						$w selection clear $el
+					} else {
+						$w selection set $el
+					}
+				} else {
+					$w selection clear 0 end
+					$w selection set $el
+					$w selection anchor $el
+					set Priv(listboxSelection) {}
+					set Priv(listboxPrev) $el
+				}
+				event generate $w <<ListboxSelect>>
+				if {$focus && [winfo exists $w]} {
+					focus $w
+				}
+			}')
 		}
 	}
 	# Windows only

Modified: pkg/tcltk2/TODO
===================================================================
--- pkg/tcltk2/TODO	2009-11-30 23:46:47 UTC (rev 233)
+++ pkg/tcltk2/TODO	2009-12-12 11:00:02 UTC (rev 234)
@@ -1,8 +1,5 @@
 = tcltk2 To Do list
 
-* A bug appeared with mclistbox: selecting an item causes a Tcl error -state
-  not defined.
-
 * Despite I changed ::msgcat::mclocale to de, tk2chooseFont() is still in
   English (but it works for fr... why?)