* tkcon.tcl: Use -underline clearly to disambiguate from new 8.6.6

	option -underlinefg [Bug #54] (bachmann)

diff --git a/ChangeLog b/ChangeLog
index 958592d8a5013c8185eb6d51e58f9dfa93276cee..5931e4d06aed1d9dd573478630b4cf24ddcc10a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-14  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl: Use -underline clearly to disambiguate from new 8.6.6
+       option -underlinefg [Bug #54] (bachmann)
+

 2015-10-20  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (edit): prevent file edit from undoing loading of file
 2015-10-20  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (edit): prevent file edit from undoing loading of file

diff --git a/tkcon.tcl b/tkcon.tcl
index b83bd65c22dcf21278e6226b46bf02974e3f53ed..997353d3c175cc540226f531f76a85dcb7aa0ea9 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -1069,9 +1069,9 @@ proc ::tkcon::EvalCmd {w cmd} {
                    set tag [UniqueTag $w]
                    $w insert output $res [list stderr $tag] \n$trailer stderr
                    $w tag bind $tag <Enter> \
                    set tag [UniqueTag $w]
                    $w insert output $res [list stderr $tag] \n$trailer stderr
                    $w tag bind $tag <Enter> \

-                           [list $w tag configure $tag -under 1]
+                           [list $w tag configure $tag -underline 1]

                    $w tag bind $tag <Leave> \
                    $w tag bind $tag <Leave> \

-                           [list $w tag configure $tag -under 0]
+                           [list $w tag configure $tag -underline 0]

                    $w tag bind $tag <ButtonRelease-1> \
                            "if {!\[info exists tk::Priv(mouseMoved)\] || !\$tk::Priv(mouseMoved)} \
                            {[list $OPT(edit) -attach [Attach] -type error -- $PRIV(errorInfo)]}"
                    $w tag bind $tag <ButtonRelease-1> \
                            "if {!\[info exists tk::Priv(mouseMoved)\] || !\$tk::Priv(mouseMoved)} \
                            {[list $OPT(edit) -attach [Attach] -type error -- $PRIV(errorInfo)]}"


@@ -3070,8 +3070,8 @@ proc ::tkcon::HighlightError w {
            set tag [UniqueTag $w]
            $w tag add $tag $start+${c0}c $start+1c+${c1}c
            $w tag configure $tag -foreground $COLOR(stdout)
            set tag [UniqueTag $w]
            $w tag add $tag $start+${c0}c $start+1c+${c1}c
            $w tag configure $tag -foreground $COLOR(stdout)

-           $w tag bind $tag <Enter> [list $w tag configure $tag -under 1]
-           $w tag bind $tag <Leave> [list $w tag configure $tag -under 0]
+           $w tag bind $tag <Enter> [list $w tag configure $tag -underline 1]
+           $w tag bind $tag <Leave> [list $w tag configure $tag -underline 0]

            $w tag bind $tag <ButtonRelease-1> "if {!\$tk::Priv(mouseMoved)} \
                    {[list $OPT(edit) -attach $app -type proc -find $what -- $cmd]}"
        }
            $w tag bind $tag <ButtonRelease-1> "if {!\$tk::Priv(mouseMoved)} \
                    {[list $OPT(edit) -attach $app -type proc -find $what -- $cmd]}"
        }


@@ -3099,8 +3099,8 @@ proc ::tkcon::HighlightError w {
            set tag [UniqueTag $w]
            $w tag add $tag $ix+1c $start
            $w tag configure $tag -foreground $COLOR(proc)
            set tag [UniqueTag $w]
            $w tag add $tag $ix+1c $start
            $w tag configure $tag -foreground $COLOR(proc)

-           $w tag bind $tag <Enter> [list $w tag configure $tag -under 1]
-           $w tag bind $tag <Leave> [list $w tag configure $tag -under 0]
+           $w tag bind $tag <Enter> [list $w tag configure $tag -underline 1]
+           $w tag bind $tag <Leave> [list $w tag configure $tag -underline 0]

            $w tag bind $tag <ButtonRelease-1> "if {!\$tk::Priv(mouseMoved)} \
                    {[list $OPT(edit) -attach $app -type proc -- $cmd]}"
        }
            $w tag bind $tag <ButtonRelease-1> "if {!\$tk::Priv(mouseMoved)} \
                    {[list $OPT(edit) -attach $app -type proc -- $cmd]}"
        }


@@ -3935,14 +3935,14 @@ proc edit {args} {
     ##
     set text $w.text
     set m [menu [::tkcon::MenuButton $menu Edit edit]]
     ##
     set text $w.text
     set m [menu [::tkcon::MenuButton $menu Edit edit]]

-    $m add command -label "Cut"   -under 2 \
+    $m add command -label "Cut"   -underline 2 \

        -command [list tk_textCut $text]
        -command [list tk_textCut $text]

-    $m add command -label "Copy"  -under 0 \
+    $m add command -label "Copy"  -underline 0 \

        -command [list tk_textCopy $text]
        -command [list tk_textCopy $text]

-    $m add command -label "Paste" -under 0 \
+    $m add command -label "Paste" -underline 0 \

        -command [list tk_textPaste $text]
     $m add separator
        -command [list tk_textPaste $text]
     $m add separator

-    $m add command -label "Find" -under 0 \
+    $m add command -label "Find" -underline 0 \

        -command [list ::tkcon::FindBox $text]
 
     ## Send To Menu
        -command [list ::tkcon::FindBox $text]
 
     ## Send To Menu