diff options
| author | dgp <dgp@users.sourceforge.net> | 2022-11-01 14:31:58 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2022-11-01 14:31:58 (GMT) |
| commit | 40d24f6d095a3ee884507da98d9628c8ed020ff3 (patch) | |
| tree | 39b8badd84e0df09423b37e27bdca0ab0ba95f47 /library | |
| parent | 72842f084db3f9cd9f0d845ea30920613fadf4ef (diff) | |
| parent | 7f18fa84d8ebf555b4c1b1df0c826d33685dcb33 (diff) | |
| download | tk-40d24f6d095a3ee884507da98d9628c8ed020ff3.zip tk-40d24f6d095a3ee884507da98d9628c8ed020ff3.tar.gz tk-40d24f6d095a3ee884507da98d9628c8ed020ff3.tar.bz2 | |
merge 8.6
Diffstat (limited to 'library')
| -rw-r--r-- | library/demos/cscroll.tcl | 2 | ||||
| -rw-r--r-- | library/demos/entry2.tcl | 6 | ||||
| -rw-r--r-- | library/demos/goldberg.tcl | 2 | ||||
| -rw-r--r-- | library/demos/items.tcl | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl index c88bfa9..98a4be2 100644 --- a/library/demos/cscroll.tcl +++ b/library/demos/cscroll.tcl @@ -25,7 +25,7 @@ set btns [addSeeDismiss $w.buttons $w] pack $btns -side bottom -fill x frame $w.grid -scrollbar $w.hscroll -orient horiz -command "$c xview" +scrollbar $w.hscroll -orient horizontal -command "$c xview" scrollbar $w.vscroll -command "$c yview" canvas $c -relief sunken -borderwidth 2 -scrollregion {-11c -11c 50c 20c} \ -xscrollcommand "$w.hscroll set" \ diff --git a/library/demos/entry2.tcl b/library/demos/entry2.tcl index 6405d85..a4009a7 100644 --- a/library/demos/entry2.tcl +++ b/library/demos/entry2.tcl @@ -27,15 +27,15 @@ frame $w.frame -borderwidth 10 pack $w.frame -side top -fill x -expand 1 entry $w.frame.e1 -xscrollcommand "$w.frame.s1 set" -ttk::scrollbar $w.frame.s1 -orient horiz -command \ +ttk::scrollbar $w.frame.s1 -orient horizontal -command \ "$w.frame.e1 xview" frame $w.frame.spacer1 -width 20 -height 10 entry $w.frame.e2 -xscrollcommand "$w.frame.s2 set" -ttk::scrollbar $w.frame.s2 -orient horiz -command \ +ttk::scrollbar $w.frame.s2 -orient horizontal -command \ "$w.frame.e2 xview" frame $w.frame.spacer2 -width 20 -height 10 entry $w.frame.e3 -xscrollcommand "$w.frame.s3 set" -ttk::scrollbar $w.frame.s3 -orient horiz -command \ +ttk::scrollbar $w.frame.s3 -orient horizontal -command \ "$w.frame.e3 xview" pack $w.frame.e1 $w.frame.s1 $w.frame.spacer1 $w.frame.e2 $w.frame.s2 \ $w.frame.spacer2 $w.frame.e3 $w.frame.s3 -side top -fill x diff --git a/library/demos/goldberg.tcl b/library/demos/goldberg.tcl index 7bedfa9..90815fb 100644 --- a/library/demos/goldberg.tcl +++ b/library/demos/goldberg.tcl @@ -136,7 +136,7 @@ proc DoCtrlFrame {w} { ttk::labelframe $w.message -text "Message" ttk::entry $w.message.e -textvariable S(message) -justify center ttk::labelframe $w.speed -text "Speed: 0" - ttk::scale $w.speed.scale -orient h -from 1 -to 10 -variable S(speed) + ttk::scale $w.speed.scale -orient horizontal -from 1 -to 10 -variable S(speed) ttk::button $w.about -text About -command [list About $w] grid $w.start -in $w.ctrl -row 0 -sticky ew diff --git a/library/demos/items.tcl b/library/demos/items.tcl index 1297046..19cd4f4 100644 --- a/library/demos/items.tcl +++ b/library/demos/items.tcl @@ -32,7 +32,7 @@ canvas $c -scrollregion {0c 0c 30c 24c} -width 15c -height 10c \ -xscrollcommand "$w.frame.hscroll set" \ -yscrollcommand "$w.frame.vscroll set" ttk::scrollbar $w.frame.vscroll -command "$c yview" -ttk::scrollbar $w.frame.hscroll -orient horiz -command "$c xview" +ttk::scrollbar $w.frame.hscroll -orient horizontal -command "$c xview" grid $c -in $w.frame \ -row 0 -column 0 -rowspan 1 -columnspan 1 -sticky news |