summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2009-04-10 16:40:12 (GMT)
committerdas <das>2009-04-10 16:40:12 (GMT)
commit3fc16bc1b81748b6b6a200d409e51ddfd76228d1 (patch)
treea6618eefca3aad1f35b31eceeecdc9a9b25714fb
parent00749bda54d2b149cdf17b1ed2031a6b7eeae430 (diff)
downloadtk-3fc16bc1b81748b6b6a200d409e51ddfd76228d1.zip
tk-3fc16bc1b81748b6b6a200d409e51ddfd76228d1.tar.gz
tk-3fc16bc1b81748b6b6a200d409e51ddfd76228d1.tar.bz2
* library/demos/widget: GOOBE: use ttk::cursor
-rw-r--r--ChangeLog4
-rw-r--r--library/demos/widget12
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 14b15a1..c40d331 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-04-10 Daniel Steffen <das@users.sourceforge.net>
+ * library/demos/widget: GOOBE: use ttk::cursor
+
+ * library/ttk/cursors.tcl: backport ttk::cursor from HEAD
+
* library/demos/knightstour.tcl: fix knightstour demo not running from
interactive wish.
diff --git a/library/demos/widget b/library/demos/widget
index 9182904..6974a38 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -10,7 +10,7 @@ exec wish "$0" "$@"
# separate ".tcl" files is this directory, which are sourced by this script as
# needed.
#
-# RCS: @(#) $Id: widget,v 1.51 2008/03/11 22:30:17 das Exp $
+# RCS: @(#) $Id: widget,v 1.51.2.1 2009/04/10 16:40:12 das Exp $
package require Tcl 8.5
package require Tk 8.5
@@ -199,12 +199,12 @@ set lastLine ""
.t tag bind demo <Enter> {
set lastLine [.t index {@%x,%y linestart}]
.t tag add hot "$lastLine +1 chars" "$lastLine lineend -1 chars"
- .t config -cursor hand2
+ .t config -cursor [::ttk::cursor link]
showStatus [.t index {@%x,%y}]
}
.t tag bind demo <Leave> {
.t tag remove hot 1.0 end
- .t config -cursor xterm
+ .t config -cursor [::ttk::cursor text]
.statusBar.lab config -text ""
}
.t tag bind demo <Motion> {
@@ -516,7 +516,7 @@ proc invoke index {
return
}
set cursor [.t cget -cursor]
- .t configure -cursor watch
+ .t configure -cursor [::ttk::cursor busy]
update
set demo [string range [lindex $tags $i] 5 end]
uplevel 1 [list source [file join $tk_demoDirectory $demo.tcl]]
@@ -537,11 +537,11 @@ proc showStatus index {
set cursor [.t cget -cursor]
if {$i < 0} {
.statusBar.lab config -text " "
- set newcursor xterm
+ set newcursor [::ttk::cursor text]
} else {
set demo [string range [lindex $tags $i] 5 end]
.statusBar.lab config -text [mc "Run the \"%s\" sample program" $demo]
- set newcursor hand2
+ set newcursor [::ttk::cursor link]
}
if {$cursor ne $newcursor} {
.t config -cursor $newcursor