* doc/ttk_Geometry.3, doc/ttk_Theme.3, doc/ttk_button.n:

	* doc/ttk_checkbutton.n, doc/ttk_combobox.n, doc/ttk_dialog.n:
	* doc/ttk_entry.n, doc/ttk_frame.n, doc/ttk_image.n:
	* doc/ttk_intro.n, doc/ttk_label.n, doc/ttk_labelframe.n:
	* doc/ttk_menubutton.n, doc/ttk_notebook.n, doc/ttk_panedwindow.n:
	* doc/ttk_progressbar.n, doc/ttk_radiobutton.n, doc/ttk_scrollbar.n:
	* doc/ttk_separator.n, doc/ttk_sizegrip.n, doc/ttk_style.n:
	* doc/ttk_treeview.n, doc/ttk_widget.n,:
	* generic/ttk/ttk.decls, generic/ttk/ttkBlink.c:
	* generic/ttk/ttkButton.c, generic/ttk/ttkCache.c:
	* generic/ttk/ttkClamTheme.c, generic/ttk/ttkClassicTheme.c:
	* generic/ttk/ttkDecls.h, generic/ttk/ttkDefaultTheme.c:
	* generic/ttk/ttkElements.c, generic/ttk/ttkEntry.c:
	* generic/ttk/ttkFrame.c, generic/ttk/ttkImage.c:
	* generic/ttk/ttkInit.c, generic/ttk/ttkLabel.c:
	* generic/ttk/ttkLayout.c, generic/ttk/ttkManager.c:
	* generic/ttk/ttkManager.h, generic/ttk/ttkNotebook.c:
	* generic/ttk/ttkPanedwindow.c, generic/ttk/ttkProgress.c:
	* generic/ttk/ttkScale.c, generic/ttk/ttkScroll.c:
	* generic/ttk/ttkScrollbar.c, generic/ttk/ttkSeparator.c:
	* generic/ttk/ttkSquare.c, generic/ttk/ttkState.c:
	* generic/ttk/ttkStubInit.c, generic/ttk/ttkStubLib.c:
	* generic/ttk/ttkTagSet.c, generic/ttk/ttkTheme.c:
	* generic/ttk/ttkTheme.h, generic/ttk/ttkThemeInt.h:
	* generic/ttk/ttkTrace.c, generic/ttk/ttkTrack.c:
	* generic/ttk/ttkTreeview.c, generic/ttk/ttkWidget.c:
	* generic/ttk/ttkWidget.h:
	* library/demos/ttk_demo.tcl, library/demos/ttk_iconlib.tcl:
	* library/demos/ttk_repeater.tcl:
	* library/ttk/altTheme.tcl, library/ttk/aquaTheme.tcl:
	* library/ttk/button.tcl, library/ttk/clamTheme.tcl:
	* library/ttk/classicTheme.tcl, library/ttk/combobox.tcl:
	* library/ttk/cursors.tcl, library/ttk/defaults.tcl:
	* library/ttk/dialog.tcl, library/ttk/entry.tcl:
	* library/ttk/fonts.tcl, library/ttk/icons.tcl:
	* library/ttk/keynav.tcl, library/ttk/menubutton.tcl:
	* library/ttk/notebook.tcl, library/ttk/panedwindow.tcl:
	* library/ttk/progress.tcl, library/ttk/scale.tcl:
	* library/ttk/scrollbar.tcl, library/ttk/sizegrip.tcl:
	* library/ttk/treeview.tcl, library/ttk/ttk.tcl:
	* library/ttk/utils.tcl, library/ttk/winTheme.tcl:
	* library/ttk/xpTheme.tcl:
	* macosx/ttkMacOSXTheme.c:
	* tests/ttk/all.tcl, tests/ttk/bwidget.test, tests/ttk/combobox.test:
	* tests/ttk/entry.test, tests/ttk/image.test:
	* tests/ttk/labelframe.test, tests/ttk/layout.test:
	* tests/ttk/misc.test, tests/ttk/notebook.test:
	* tests/ttk/panedwindow.test, tests/ttk/progressbar.test:
	* tests/ttk/scrollbar.test, tests/ttk/treetags.test:
	* tests/ttk/treeview.test, tests/ttk/ttk.test, tests/ttk/validate.test:
	* win/ttkWinMonitor.c, win/ttkWinTheme.c, win/ttkWinXPTheme.c:
	First import of Ttk themed Tk widgets as branched from tile 0.7.8

	* generic/tkInt.h, generic/tkWindow.c: add Ttk_Init call, copy
	tk classic widgets to ::tk namespace.
	* library/tk.tcl: add source of ttk/ttk.tcl, define $::ttk::library.
	* unix/Makefile.in, win/Makefile.in: add Ttk build bits
	* win/configure, win/configure.in: check for uxtheme.h (XP theme).

1 files changed, 423 insertions, 0 deletions

diff --git a/library/ttk/treeview.tcl b/library/ttk/treeview.tcl
new file mode 100644
index 0000000..265f34c
--- /dev/null
+++ b/library/ttk/treeview.tcl
@@ -0,0 +1,423 @@
+#
+# $Id: treeview.tcl,v 1.1 2006/10/31 01:42:27 hobbs Exp $
+#
+# Ttk widget set -- bindings for Treeview widget.
+#
+
+namespace eval ttk::treeview {
+    variable State
+
+    # Enter/Leave/Motion
+    #
+    set State(activeWidget) 	{}
+    set State(activeHeading) 	{}
+
+    # Press/drag/release:
+    #
+    set State(pressMode) 	none
+    set State(pressX)		0
+
+    # For pressMode == "resize"
+    set State(minWidth)		24
+    set State(resizeColumn)	#0
+    set State(resizeWidth)	0
+
+    # For pressmode == "heading"
+    set State(heading)  	{}
+
+    # Provide [lassign] if not already present
+    # (@@@ TODO: check if this is still needed after horrible-identify purge)
+    #
+    if {![llength [info commands lassign]]} {
+	proc lassign {vals args} {
+	    uplevel 1 [list foreach $args $vals break]
+	}
+    }
+}
+
+### Widget bindings.
+#
+
+bind Treeview	<Motion> 		{ ttk::treeview::Motion %W %x %y }
+bind Treeview	<B1-Leave>		{ #nothing }
+bind Treeview	<Leave>			{ ttk::treeview::ActivateHeading {} {}}
+bind Treeview	<ButtonPress-1> 	{ ttk::treeview::Press %W %x %y }
+bind Treeview	<Double-ButtonPress-1> 	{ ttk::treeview::DoubleClick %W %x %y }
+bind Treeview	<ButtonRelease-1> 	{ ttk::treeview::Release %W %x %y }
+bind Treeview	<B1-Motion> 		{ ttk::treeview::Drag %W %x %y }
+bind Treeview 	<KeyPress-Up>    	{ ttk::treeview::Keynav %W up }
+bind Treeview 	<KeyPress-Down>  	{ ttk::treeview::Keynav %W down }
+bind Treeview 	<KeyPress-Right> 	{ ttk::treeview::Keynav %W right }
+bind Treeview 	<KeyPress-Left>  	{ ttk::treeview::Keynav %W left }
+bind Treeview	<KeyPress-Prior>	{ %W yview scroll -1 pages }
+bind Treeview	<KeyPress-Next> 	{ %W yview scroll  1 pages }
+bind Treeview	<KeyPress-Return>	{ ttk::treeview::ToggleFocus %W }
+bind Treeview	<KeyPress-space>	{ ttk::treeview::ToggleFocus %W }
+
+bind Treeview	<Shift-ButtonPress-1> \
+		{ ttk::treeview::Select %W %x %y extend }
+bind Treeview	<Control-ButtonPress-1> \
+		{ ttk::treeview::Select %W %x %y toggle }
+
+# Standard mousewheel bindings:
+#
+bind Treeview <MouseWheel> { %W yview scroll [expr {- (%D / 120) * 4}] units }
+if {[string equal "x11" [tk windowingsystem]]} {
+    bind Treeview <ButtonPress-4>	{ %W yview scroll -5 units }
+    bind Treeview <ButtonPress-5>	{ %W yview scroll 5 units }
+}
+
+### Binding procedures.
+#
+
+## Keynav -- Keyboard navigation
+#
+# @@@ TODO: verify/rewrite up and down code.
+#
+proc ttk::treeview::Keynav {w dir} {
+    set focus [$w focus]
+    if {$focus eq ""} { return }
+
+    switch -- $dir {
+	up {
+	    if {[set up [$w prev $focus]] eq ""} {
+	        set focus [$w parent $focus]
+	    } else {
+		while {[$w item $up -open] && [llength [$w children $up]]} {
+		    set up [lindex [$w children $up] end]
+		}
+		set focus $up
+	    }
+	}
+	down {
+	    if {[$w item $focus -open] && [llength [$w children $focus]]} {
+	        set focus [lindex [$w children $focus] 0]
+	    } else {
+		set up $focus
+		while {$up ne "" && [set down [$w next $up]] eq ""} {
+		    set up [$w parent $up]
+		}
+		set focus $down
+	    }
+	}
+	left {
+	    if {[$w item $focus -open] && [llength [$w children $focus]]} {
+	    	CloseItem $w $focus
+	    } else {
+	    	set focus [$w parent $focus]
+	    }
+	}
+	right {
+	    OpenItem $w $focus
+	}
+    }
+
+    if {$focus != {}} {
+	SelectOp $w $focus choose
+    }
+}
+
+## Motion -- pointer motion binding.
+#	Sets cursor, active element ...
+#
+proc ttk::treeview::Motion {w x y} {
+    variable ::ttk::Cursors
+    variable State
+
+    set cursor {}
+    set activeHeading {}
+
+    lassign [$w identify $x $y] what where detail
+    switch -- $what {
+	separator { set cursor $Cursors(hresize) }
+	heading { set activeHeading $where }
+    }
+
+    if {[$w cget -cursor] ne $cursor} {
+	$w configure -cursor $cursor
+    }
+    ActivateHeading $w $activeHeading
+}
+
+## ActivateHeading -- track active heading element
+#
+proc ttk::treeview::ActivateHeading {w heading} {
+    variable State
+
+    if {$w != $State(activeWidget) || $heading != $State(activeHeading)} {
+	if {$State(activeHeading) != {}} {
+	    $State(activeWidget) heading $State(activeHeading) state !active
+	}
+	if {$heading != {}} {
+	    $w heading $heading state active
+	}
+	set State(activeHeading) $heading
+	set State(activeWidget) $w
+    }
+}
+
+## Select $w $x $y $selectop
+#	Binding procedure for selection operations.
+#	See "Selection modes", below.
+#
+proc ttk::treeview::Select {w x y op} {
+    if {[set item [$w identify row $x $y]] ne "" } {
+	SelectOp $w $item $op
+    }
+}
+
+## DoubleClick -- Double-ButtonPress-1 binding.  
+#
+proc ttk::treeview::DoubleClick {w x y} {
+    if {[set row [$w identify row $x $y]] ne ""} {
+	Toggle $w $row
+    } else {
+	Press $w $x $y ;# perform single-click action
+    }
+}
+
+## Press -- ButtonPress binding.
+#
+proc ttk::treeview::Press {w x y} {
+    lassign [$w identify $x $y] what where detail
+    focus $w	;# or: ClickToFocus?
+
+    switch -- $what {
+	nothing { }
+	heading { heading.press $w $where }
+	separator { resize.press $w $x $where }
+	cell -
+	row  -
+	item { SelectOp $w $where choose }
+    }
+    if {$what eq "item" && [string match *indicator $detail]} {
+    	Toggle $w $where
+    }
+}
+
+## Drag -- B1-Motion binding
+#
+proc ttk::treeview::Drag {w x y} {
+    variable State
+    switch $State(pressMode) {
+	resize	{ resize.drag $w $x }
+	heading	{ heading.drag $w $x $y }
+    }
+}
+
+proc ttk::treeview::Release {w x y} {
+    variable State
+    switch $State(pressMode) {
+	resize	{ resize.release $w $x }
+	heading	{ heading.release $w }
+    }
+    set State(pressMode) none
+    Motion $w $x $y
+}
+
+### Interactive column resizing.
+#
+# @@@ needs work.
+#
+proc ttk::treeview::resize.press {w x column} {
+    variable State
+
+    set State(pressMode) "resize"
+    set State(pressX)	$x
+    set State(resizeColumn) $column
+    set State(resizeWidth) [$w column $column -width]
+}
+
+proc ttk::treeview::resize.drag {w x} {
+    variable State
+    set newWidth [expr {$State(resizeWidth) + $x - $State(pressX)}]
+    if {$newWidth < $State(minWidth)} {
+	set newWidth $State(minWidth)
+    }
+    $w column $State(resizeColumn) -width $newWidth
+}
+
+proc ttk::treeview::resize.release {w x} {
+    # no-op
+}
+
+### Heading activation.
+#
+
+proc ttk::treeview::heading.press {w column} {
+    variable State
+    set State(pressMode) "heading"
+    set State(heading) $column
+    $w heading $column state pressed
+}
+
+proc ttk::treeview::heading.drag {w x y} {
+    variable State
+    lassign [$w identify $x $y] what where detail
+    if {$what eq "heading" && $where eq $State(heading)} {
+    	$w heading $State(heading) state pressed
+    } else {
+    	$w heading $State(heading) state !pressed
+    }
+}
+
+proc ttk::treeview::heading.release {w} {
+    variable State
+    if {[lsearch -exact [$w heading $State(heading) state] pressed] >= 0} {
+	after idle [$w heading $State(heading) -command]
+    }
+    $w heading $State(heading) state !pressed
+}
+
+### Selection modes.
+#
+
+## SelectOp $w $item [ choose | extend | toggle ] --
+#	Dispatch to appropriate selection operation 
+#	depending on current value of -selectmode.
+#
+proc ttk::treeview::SelectOp {w item op} {
+    select.$op.[$w cget -selectmode] $w $item
+}
+
+## -selectmode none:
+#
+proc ttk::treeview::select.choose.none {w item} { $w focus $item }
+proc ttk::treeview::select.toggle.none {w item} { $w focus $item }
+proc ttk::treeview::select.extend.none {w item} { $w focus $item }
+
+## -selectmode browse:
+#
+proc ttk::treeview::select.choose.browse {w item} { BrowseTo $w $item }
+proc ttk::treeview::select.toggle.browse {w item} { BrowseTo $w $item }
+proc ttk::treeview::select.extend.browse {w item} { BrowseTo $w $item }
+
+## -selectmode multiple:
+#
+proc ttk::treeview::select.choose.extended {w item} { 
+    BrowseTo $w $item
+}
+proc ttk::treeview::select.toggle.extended {w item} { 
+    $w selection toggle $item
+}
+proc ttk::treeview::select.extend.extended {w item} {
+    if {[set anchor [$w focus]] ne ""} {
+	$w selection set [between $w $anchor $item]
+    } else {
+    	BrowseTo $item
+    }
+}
+
+### Tree structure utilities.
+#
+
+## between $tv $item1 $item2 --
+#	Returns a list of all items between $item1 and $item2,
+#	in preorder traversal order.  $item1 and $item2 may be
+#	in either order.
+#
+# NOTES: 
+#	This routine is O(N) in the size of the tree.
+#	There's probably a way to do this that's O(N) in the number
+#	of items returned, but I'm not clever enough to figure it out.
+#
+proc ttk::treeview::between {tv item1 item2} {
+    variable between [list]
+    variable selectingBetween 0
+    ScanBetween $tv $item1 $item2 {}
+    return $between
+}
+
+## ScanBetween --
+#	Recursive worker routine for ttk::treeview::between
+#
+proc ttk::treeview::ScanBetween {tv item1 item2 item} {
+    variable between
+    variable selectingBetween
+
+    if {$item eq $item1 || $item eq $item2} {
+    	lappend between $item
+	set selectingBetween [expr {!$selectingBetween}]
+    } elseif {$selectingBetween} {
+    	lappend between $item
+    }
+    foreach child [$tv children $item] {
+	ScanBetween $tv $item1 $item2 $child
+    }
+}
+
+### User interaction utilities.
+#
+
+## OpenItem, CloseItem -- Set the open state of an item, generate event
+#
+
+proc ttk::treeview::OpenItem {w item} {
+    $w focus $item
+    event generate $w <<TreeviewOpen>>
+    $w item $item -open true
+}
+
+proc ttk::treeview::CloseItem {w item} {
+    $w item $item -open false
+    $w focus $item
+    event generate $w <<TreeviewClose>>
+}
+
+## Toggle -- toggle opened/closed state of item
+#
+proc ttk::treeview::Toggle {w item} {
+    if {[$w item $item -open]} {
+	CloseItem $w $item
+    } else {
+	OpenItem $w $item
+    }
+}
+
+## ToggleFocus -- toggle opened/closed state of focus item
+#
+proc ttk::treeview::ToggleFocus {w} {
+    set item [$w focus]
+    if {$item ne ""} {
+    	Toggle $w $item
+    }
+}
+
+## BrowseTo -- navigate to specified item; set focus and selection
+#
+proc ttk::treeview::BrowseTo {w item} {
+    $w see $item
+    $w focus $item
+    $w selection set [list $item]
+}
+
+### Style settings for selected built-in themes.
+#
+#   Do this here instead of in the theme definitions since the details are
+#   likely to change; it's better to keep this all in one place for now.
+#
+namespace eval ::ttk::treeview {
+    variable theme
+    namespace import -force ::ttk::style
+    foreach theme [style theme names] {
+	style theme settings $theme {
+	    style map Item -foreground [list selected "#FFFFFF"]
+	    style configure Row -background "#EEEEEE"
+	    style configure Heading -relief raised -font TkHeadingFont
+	    style configure Item -justify left
+	    style map Heading -relief {
+		pressed sunken
+	    }
+	    style map Row -background {
+		selected	#4a6984
+		focus	#ccccff
+		alternate	#FFFFFF
+	    }
+	    style map Cell -foreground {
+		selected	#FFFFFF
+	    }
+	}
+    }
+}
+
+#*EOF*