[Nsclspectcl-cvscommits] SF.net SVN: nsclspectcl:[2195] branches/SpecTcl-3.4

[<ro...@us...>]

Revision: 2195
          http://sourceforge.net/p/nsclspectcl/code/2195
Author:   ron-fox
Date:     2014-08-21 18:29:38 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
Change name of tkcon's clear command to tkcon-clear so it does not interfere
with SpecTcl's clear command.

Modified Paths:
--------------
    branches/SpecTcl-3.4/CHANGELOG
    branches/SpecTcl-3.4/tkcon/tkcon-2.5.tcl

Modified: branches/SpecTcl-3.4/CHANGELOG
===================================================================
--- branches/SpecTcl-3.4/CHANGELOG	2014-08-14 19:28:07 UTC (rev 2194)
+++ branches/SpecTcl-3.4/CHANGELOG	2014-08-21 18:29:38 UTC (rev 2195)
@@ -1042,4 +1042,6 @@
 	* Feature #2103 - Allow users to hide the gates on displayed spectra
           Spectra->Hide Gates and then refresh the menu is a toggle button.
         * Feature #1484 - Make work with Tcl 8.6.
-	* Fix error in 11 ring format helper - was not getting the runnumber properly.
\ No newline at end of file
+	* Fix error in 11 ring format helper - was not getting the runnumber properly.
+        * Remove clear command from new Tkcon so it does not interfere with 
+          SpecTcl's.
\ No newline at end of file

Modified: branches/SpecTcl-3.4/tkcon/tkcon-2.5.tcl
===================================================================
--- branches/SpecTcl-3.4/tkcon/tkcon-2.5.tcl	2014-08-14 19:28:07 UTC (rev 2194)
+++ branches/SpecTcl-3.4/tkcon/tkcon-2.5.tcl	2014-08-21 18:29:38 UTC (rev 2195)
@@ -1466,8 +1466,8 @@
 		-command ::tkcon::DeleteTab -state disabled
 	$m add command -label "Close Console"	-underline 0 -accel Ctrl-w \
 		-command ::tkcon::Destroy
-	$m add command -label "Clear Console"	-underline 1 -accel Ctrl-l \
-		-command { clear; ::tkcon::Prompt }
+#	$m add command -label "Clear Console"	-underline 1 -accel Ctrl-l \
+#		-command { clear; ::tkcon::Prompt }
 	if {[string match unix $tcl_platform(platform)]} {
 	    $m add separator
 	    $m add command -label "Make Xauth Secure" -und 5 \
@@ -3914,7 +3914,9 @@
 ## clear - clears the buffer of the console (not the history though)
 ## This is executed in the parent interpreter
 ## 
-proc clear {{pcnt 100}} {
+
+
+proc tkcon_clear {{pcnt 100}} {
     if {![regexp {^[0-9]*$} $pcnt] || $pcnt < 1 || $pcnt > 100} {
 	return -code error \
 		"invalid percentage to clear: must be 1-100 (100 default)"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.