arcadia 0.7.0 → 0.8.0

data/tcl/{BWidget-1.8.0 → BWidget-1.9.0}/ChangeLog

@@ -1,3 +1,292 @@
+2009-07-24 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	**** BWidget 1.9.0 tagged ****
+
+	* pkgIndex.tcl, README.txt: updated to BWidget 1.9
+
+2009-07-23 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* tree.tcl (Tree::_set_help), Tree.html DynamicHelp -helpcmd added to
+	tree node help
+	* tree.tcl (Tree::_draw_subnodes) a vertical line to a virtual root node
+	above the widget is only drawn when there are multiple child nodes.
+	This reverts the modification dated 2004-04-21 for this case.
+	[Patch 2825354] by Koen Danckaert
+
+2009-07-17 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* scrollframe.tcl (ScrollableFrame::create et al) ScrollableFrame.html
+	Background color of canvas takes the color of the scrolled frame.
+	If themed, canvas takes the themed color of the scrolled themed frame.
+	If themed, parameters -background and -bg are not available(doc + code).
+	[Patch 2822970] by Koen Danckaert
+
+2009-07-15 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* dynhelp.tcl (DynamicHelp) Typo from yesterday corrected
+	[Patch 2820851] by Koen Danckaert
+
+2009-07-14 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* dynhelp.tcl (DynamicHelp::_leave_info et al) issues:
+	- menu help sometimes not cleared when clicking off-window (unix)
+	- "-helpcmd" available also when dynamichelp is included in another
+	  widget.
+	- given "-helpcmd" always called at global scope.
+	- Protect against multiple calls of <Leave> event.
+	[Patch 2820851] by Koen Danckaert
+
+2009-07-07 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* combobox.tcl (ComboBox::_select) Do not export selection if
+	-exportselection 0 [Patch 981545] by Jeffrey Hobbs
+
+2009-07-02 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* widget.tcl (Widget::configure) Bug: ProgressDlg option -geometry
+	not setable. The former patch was improved.
+	Koen Danckaert and myself argued, that we modify symptoms without
+	basic understandings. Anyway, better now than before.
+
+2009-07-01 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* mainframe.tcl, MainFrame.html (MainFrame::getmenustate)
+	Added method getmenustate to return menu tag state
+	[Bug 948063] reported by Rolf Ade
+
+	* combobox.tcl (ComboBox::configure) Bug fixed: Widget did not take
+	focus, when -editable false and "configure -state normal" called.
+	[Bug 756334] reported by Rolf Ade
+	
+	* widget.tcl (Widget::configure) Bug: ProgressDlg option -bg not
+	setable. The special handling of subwidgets with special class or
+	path ":cmd" was improved. [Bug 611477]
+	
+	* notebook.tcl (NoteBook::_itemconfigure) Not honored option:
+	itemconfigure ... -helptext [Patch 2814050] by Koen Danckaert
+	
+2009-06-30 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* buttonbox.tcl (ButtonBox::_redraw) Bug corrected:
+	-uniform gridding option is used if tcl version >= 8.4 (not 8.3).
+	[Patch 2807147] by Koen Danckaert
+
+	* tree.tcl (Tree::_drop_cmd) If there is no node, drop didn't work.
+	[Bug 1042613] reported by Rolf Ade
+	
+	* Tree.html Bind commands: removed promise that %W would work in future.
+	The underlying widgets should only be manipulated using the node id.
+	[Bug 1224203] by Jasper Taylor, remarks by J. Tang 
+
+	* Tree.html Bind commands: with -selectfill, the given command is
+	overwritten for the background box. [Bug 1003962] by Torsten Berg
+	
+	* dropsite.tcl (DropSite::register) Bug fixed: fails on multiple drop
+	targets [Bug 1213123] by T.Neil
+
+	* combobox.tcl (ComboBox::_create_popup) Bug fixed: Return key in drop
+	down list when -bwlistbox true [Bug 1205536] patch by Steve Landers
+	
+	* combobox.tcl (ComboBox::_create_popup, ComboBox::_unmapliste)
+	Mac aqua and x11 fixes, multi screen issue still open.
+	[Bug 1451784] report by Jasper Taylor, fix by Kevin Walzer
+
+	* listbox.tcl (ListBox::_multiple_select) Selected item not deselected
+	on control-click [Bug 1029144] reported by Konrad Rosenbaum
+	
+
+2009-06-29 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* ScrolledWindow.html ScrolledWindow documentation changed:
+	Documented options: -ipad, -sides, -size, -managed
+	[Patch 2807160] Text by Koen Danckaert
+	Removed (read only) remark of option -scrollbar.
+	
+	* scrollframe.tcl (ScrollableFrame::create) changed bindings
+	[Patch 2807227] by Koen Danckaert (comment)
+	
+	* scrollw.tcl (ScrolledWindow::_set_hscroll, ScrolledWindow::_set_vscroll)
+	Bug corrected: enless loop when both scrollbars where automatically
+	mapped and the window size was changed by this action (on linux).
+	Scrollbar unmapping and mapping secured by a locked update [Bug 2783019]
+
+	* widget.tcl (Widget::tkinclude) : option data base entry name keeps the
+	original name and not the renamed name.
+	The only resulting modification is to rename the option key for
+	"MessageDlg -text" from "*MessageDlg.frame.msg.message" to
+	"*MessageDlg.frame.msg.text". [Bug 1266792]
+	
+	* widget.tcl (Widget::init) : fixed a memory leak on wrong option value.
+	[Bug 1230737] 
+	
+2009-06-26 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* listbox.tcl (ListBox::create et al) new feature: listbox option
+	-listbox now read/write [Bug 1501874] reported by Stephen Huntley
+	
+	* dynhelp.tcl (DynamicHelp::_show_help) fixed issue (as far as possible):
+	Dynamic help baloon was on the main screen, if it touched the border on
+	a windows multi screen configuration.
+	The fix assumes, that all screens have same dimensions and no gaps in-
+	between. This is necessary, because multi-screen configuration paramters
+	may not be interrogated by tk (despite of coordinates out of the screen)
+	[Bug 1499135] reported by Gregor
+
+	* notebook.tcl (NoteBook::delete) Deleted also state variables
+	[Bug 1445219] reported by Eric Kemp-Benedict
+
+2009-06-25 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* combobox.tcl (ComboBox::getvalue et al) fixed bug: getvalue returned
+	first apearence of current data instead of clicked index, which may not
+	be the same if values is not unique. Additional variable _index(path)
+	added to hold click index [Bug 1610965] reported by Martin Lemburg
+
+2009-06-24 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* scrollframe.tcl (ScrollableFrame::create, ScrollableFrame::_resize,
+	ScrollableFrame::_frameConfigure) fixed two issues:
+	- Scrollbar activated even if not necessary
+	  Fix: update scrolling reagion on configure event of the frame
+	- Disfunction if the frame got to small to be on the current view
+	  Fix: update scrolling reagion on map or unmap events
+	[Patch 2807227] by Koen Danckaert
+	
+	* buttonbox.tcl (ButtonBox::_redraw) Bug: homogeneous button width
+	not honored if button size changes after creation.
+	-uniform gridding option is used if tcl version >= 8.3.
+	[Patch 2807147] by Koen Danckaert
+	
+2009-06-16 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* combobox.tcl (ComboBox::_create_popup) In dropdown list,
+	a vertical scrollbar was always shown if horizantal is used.
+	ScrolledWindow is now called with "-managed 1".
+	[Patch 2807160] by Koen Danckaert
+
+2009-06-11 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* combobox.tcl removed \ before empty line (potential
+	trap) [Bug 2804961] Andreas Kupries
+	
+	* dialog.html Documented -geometry option.
+	[Bug 1634416] Erik Leunissen
+
+2009-06-10 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* no.rc added norwegian translation file
+	[Feature Request 2797153] provided by Lars Martin Hambro
+	
+	* passwddlg.tcl (PasswdDlg::_verifonpasswd) check for
+	disabled password field and confirm directly.
+	[Bug 1642050] (Calvin Bascom) Enter key did not confirm
+	dialog when -passwdstate disabled.
+	
+	* combobox.tcl (ComboBox::_select) included [Patch 981545],
+	but commented out - it works for me without it.
+
+2009-06-10 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* dialog.html Added documentation for option -buttonwidth
+	of Dialog
+	[Bug 1668587] (Eric Leunissen)
+
+2009-06-10 Harald Oehlmann  <oehhar@users.sourceforge.net>
+
+	* arrow.tcl initialised set _grab(oldstate) to "normal" to avoid
+	error when there is a ArrowButton::_leave without corresponding
+	ArrowButton::_enter [Bug 2762361]
+	
+	* entry.tcl (Entry::_path_command) Add "invoke" to the list of
+	internally handled commands
+	[Bug 2340320] (patch by relaxmike@users.sourceforge.net)
+	
+	* uitils.tcl (BWidget::place) BWidget::place used screen width
+	instead window width.
+	[Bug 1842346] (patch by Niels Gollesch ngoelles@users.sourceforge.net)
+	
+	* listbox.tcl (ListBox::_redraw_selection) Added check if redrawn
+	item is on the to-delete list and thus does not exist any more as
+	BWidget. [Bug 1752755] (legolas_a20@users.sourceforge.net]
+
+2008-10-30  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* tree.tcl (Tree::_node_name_rev): Return node names as they are
+	input, and properly handle :: in node names.  This changes
+	internal node name reps, but should be transparent to the user,
+	except for the result of [insert].
+
+2008-05-26  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* tree.tcl (Tree::_redraw_selection):       do not allow empty
+	* listbox.tcl (ListBox::_redraw_selection): fill color as that
+	creates a transparent item that doesn't return a bbox.  This
+	showed up on OS X/Aqua, where the listbox selectforeground
+	defaults to empty. [AS Bug 77186 74923]
+
+2007-10-31  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* lang/nl.rc (new): Dutch translation [Bug 1804469]
+
+	* lang/hu.rc (new): Hungarian translation [Bug 1821842]
+
+	* tree.tcl (Tree::insert): do node_name on parent arg [Bug 1046955]
+
+	* listbox.tcl: speed up ListBox insertion significantly. [Bug 1472443]
+
+2007-05-11  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* widget.tcl (Widget::theme): make sure Tk 8.5a6 is recognized as
+	having the themed widgets
+
+2006-12-20  J. Tang  <tang@jtang.org>
+
+	* util.tcl: fixed BWidget::write for widgets that require
+	DynamicHelp.  [bug 1518803]
+
+2006-12-05  Andreas Kupries <andreask@activestate.com>
+
+	* demo/demo.tcl (Demo::main): Removed the 'inscope' qualifier from
+	  the 'package require Bwidget'. The package system already forces
+	  loading and sourcing of package code in the global namespace, so
+	  this is bogus.
+
+2006-11-13  J. Tang  <tang@jtang.org>
+
+	* panedw.tcl: if activator is set to line then its width is set to
+	3.  --activator was an undocumented option; updated man page to
+	make it documented.  Thanks to Jos Decoster for pointing this out.
+
+2006-11-10  J. Tang  <tang@jtang.org>
+
+	* widget.tcl: remove relative namespace resolution of variables,
+	in anticipation of TIP 278.  Widget should have been doing this
+	anyways.  [bug 1579744]
+
+	* DragSite.html: noted that -draginitcmd can return an empty
+	string to prevent a drag [bug 740499]
+	
+	* DropSite.html: fixed documentation with DropSite::register
+	command [bug 740474]
+
+	* combobox.tcl: allow autocomplete and autopost be
+	enabled/disabled after the widget was created [bug 1588808]; fixed
+	keysym in autopost binding [bug 1589111]
+
+	* tree.tcl: fixed error with drag & drop's autoscroll [bug
+	1408494]
+	
+	* listbox.tcl: fixed error with drag & drop's autoscroll; fixed
+	error when dropping at the end of the list
+
+	* Added dynamic help to text tags (man page updated); fixed resize
+	bug with scrollframes.  Thanks to Jos Decoster for these patches.
+
+2006-10-20  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* utils.tcl (BWidget::bindMouseWheel): do not make special
+	mousewheel bindings if global ones exist (like from style::as)
+
 2006-09-28  J. Tang  <tang@jtang.org>
 
 	**** BWIDGET 1.8.0 TAGGED ****

data/tcl/{BWidget-1.8.0 → BWidget-1.9.0}/README.txt

@@ -1,4 +1,4 @@
-BWidget ToolKit 1.8.0				October 2006
+BWidget ToolKit 1.9.0				July 2009
 Copyright (c) 1998-1999 UNIFIX.
 Copyright (c) 2001-2002 ActiveState Corp. 
 
@@ -24,7 +24,7 @@ community developers.  See the ChangeLog file for details.
 
 --------------------------------------------------------------------------
 
-WIDGET LIST (1.8)
+WIDGET LIST (1.9)
 
 Simple Widgets 
       Label           Extended Label widget

data/tcl/{BWidget-1.8.0 → BWidget-1.9.0}/arrow.tcl

@@ -70,7 +70,7 @@ namespace eval ArrowButton {
     variable _grab
     variable _moved
 
-    array set _grab {current "" pressed "" oldstate "" oldrelief ""}
+    array set _grab {current "" pressed "" oldstate "normal" oldrelief ""}
 }
 
 

data/tcl/{BWidget-1.8.0 → BWidget-1.9.0}/buttonbox.tcl

@@ -335,6 +335,11 @@ proc ButtonBox::_redraw { path } {
     upvar 0  $path data
     Widget::getVariable $path buttons
 
+    # For tk >= 8.4, -uniform gridding option is used.
+    # Otherwise, there is the constraint, that button size may not change after
+    # creation.
+    set uniformAvailable [expr {0 <= [package vcompare [info patchlevel] 8.4.0]}]
+
     ## We re-grid the buttons from left-to-right.  As we go through
     ## each button, we check its spacing and which direction the
     ## spacing applies to.  Once spacing has been applied to an index,
@@ -350,12 +355,16 @@ proc ButtonBox::_redraw { path } {
         if {[string equal [Widget::getoption $path -orient] "horizontal"]} {
             grid $but -column $idx -row 0 -sticky nsew
             if { [Widget::getoption $path -homogeneous] } {
-                set req [winfo reqwidth $but]
-                if { $req > $data(max) } {
-                    grid columnconfigure $path [expr {2*$i}] -minsize $req
-                    set data(max) $req
+                if {$uniformAvailable} {
+                    grid columnconfigure $path $idx -uniform koen -weight 1
+                } else {
+                    set req [winfo reqwidth $but]
+                    if { $req > $data(max) } {
+                        grid columnconfigure $path [expr {2*$i}] -minsize $req
+                        set data(max) $req
+                    }
+                    grid columnconfigure $path $idx -weight 1
                 }
-                grid columnconfigure $path $idx -weight 1
             } else {
                 grid columnconfigure $path $idx -weight 0
             }
@@ -380,13 +389,15 @@ proc ButtonBox::_redraw { path } {
         incr idx 2
     }
 
-    # Now that the maximum size has been calculated, go back through
-    # and correctly set the size for homogeneous horizontal buttons.
-    if { [string equal [Widget::getoption $path -orient] "horizontal"] && [Widget::getoption $path -homogeneous] } {
-        set idx 0
-        foreach i $data(buttons) {
-            grid columnconfigure $path $idx -minsize $data(max)
-            incr idx 2
+    if {!$uniformAvailable} {
+        # Now that the maximum size has been calculated, go back through
+        # and correctly set the size for homogeneous horizontal buttons.
+        if { [string equal [Widget::getoption $path -orient] "horizontal"] && [Widget::getoption $path -homogeneous] } {
+            set idx 0
+            foreach i $data(buttons) {
+                grid columnconfigure $path $idx -minsize $data(max)
+                incr idx 2
+            }
         }
     }
 }

data/tcl/{BWidget-1.8.0 → BWidget-1.9.0}/combobox.tcl

@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 #  combobox.tcl
 #  This file is part of Unifix BWidget Toolkit
-#  $Id: combobox.tcl,v 1.34 2006/09/28 15:46:06 dev_null42a Exp $
+#  $Id: combobox.tcl,v 1.42 2009/07/07 17:28:14 oehhar Exp $
 # ----------------------------------------------------------------------------
 #  Index of commands:
 #     - ComboBox::create
@@ -25,7 +25,7 @@ namespace eval ComboBox {
 
     Widget::tkinclude ComboBox frame :cmd \
 	include {-relief -borderwidth -bd -background} \
-	initialize {-relief sunken -borderwidth 2} \
+	initialize {-relief sunken -borderwidth 2}
 
     Widget::bwinclude ComboBox Entry .e \
 	remove {-relief -bd -borderwidth -bg} \
@@ -53,13 +53,15 @@ namespace eval ComboBox {
     Widget::syncoptions ComboBox Entry .e {-text {}}
 
     ::bind BwComboBox <FocusIn> [list after idle {BWidget::refocus %W %W.e}]
-    ::bind BwComboBox <Destroy> [list Widget::destroy %W]
+    ::bind BwComboBox <Destroy> [list ComboBox::_destroy %W]
 
     ::bind ListBoxHotTrack <Motion> {
         %W selection clear 0 end
         %W activate @%x,%y
         %W selection set @%x,%y
     }
+
+    variable _index
 }
 
 
@@ -101,7 +103,7 @@ proc ComboBox::create { path args } {
         ::bind $entry <Key-Down>  [list ComboBox::_mapliste $path]
     }
 
-    if {[string equal $::tcl_platform(platform) "unix"]} {
+    if {[string equal [tk windowingsystem] "x11"]} {
 	set ipadx 0
 	set width 11
     } else {
@@ -155,6 +157,8 @@ proc ComboBox::create { path args } {
         Widget::configure $path [list -bwlistbox $bw]
     }
 
+    set ComboBox::_index($path) -1
+
     return [Widget::create ComboBox $path]
 }
 
@@ -181,8 +185,8 @@ proc ComboBox::configure { path args } {
     set entry $path.e
 
 
-    set list [list -images -values -bwlistbox -hottrack]
-    foreach {ci cv cb ch} [eval [linsert $list 0 Widget::hasChangedX $path]] { break }
+    set list [list -images -values -bwlistbox -hottrack -autocomplete -autopost]
+    foreach {ci cv cb ch cac cap} [eval [linsert $list 0 Widget::hasChangedX $path]] { break }
 
     if { $ci } {
         set images [Widget::cget $path -images]
@@ -193,6 +197,40 @@ proc ComboBox::configure { path args } {
         }
     }
 
+    ## If autocomplete toggled, turn bindings on/off
+    if { $cac } {
+        if {[Widget::cget $path -autocomplete]} {
+            ::bind $entry <KeyRelease> +[list $path _auto_complete %K]
+        } else {
+            set bindings [split [::bind $entry <KeyRelease>] \n]
+            if {[set idx [lsearch $bindings [list $path _auto_complete %K]]] != -1} {
+                ::bind $entry <KeyRelease> [join [lreplace $bindings $idx $idx] \n]
+            }
+        }
+    }
+
+    ## If autopost toggled, turn bindings on/off
+    if { $cap } {
+        if {[Widget::cget $path -autopost]} {
+            ::bind $entry <KeyRelease> +[list $path _auto_post %K]
+            set bindings [split [::bind $entry <Key-Up>] \n]
+            if {[set idx [lsearch $bindings [list ComboBox::_unmapliste $path]]] != -1} {
+                ::bind $entry <Key-Up> [join [lreplace $bindings $idx $idx] \n]
+            }
+            set bindings [split [::bind $entry <Key-Down>] \n]
+            if {[set idx [lsearch $bindings [list ComboBox::_mapliste $path]]] != -1} {
+                ::bind $entry <Key-Down> [join [lreplace $bindings $idx $idx] \n]
+            }
+        } else {
+            set bindings [split [::bind $entry <KeyRelease>] \n]
+            if {[set idx [lsearch $bindings [list $path _auto_post %K]]] != -1} {
+                ::bind $entry <KeyRelease> [join [lreplace $bindings $idx $idx] \n]
+            }
+            ::bind $entry <Key-Up> +[list ComboBox::_unmapliste $path]
+            ::bind $entry <Key-Down> +[list ComboBox::_mapliste $path]
+        }
+    }
+
     set bw [Widget::cget $path -bwlistbox]
 
     ## If the images, bwlistbox, hottrack or values have changed,
@@ -234,6 +272,13 @@ proc ComboBox::configure { path args } {
 	}
     }
 
+    # if state changed to normal and -editable false, the edit must take focus
+    if {    [Widget::hasChangedX $path -state] \
+        && ![string equal [Widget::cget $path -state] "disabled"] \
+        && ![Widget::cget $path -editable] } {
+        Entry::configure $entry -takefocus 1
+    }
+
     # if the dropdown listbox is shown, simply force the actual entry
     #  colors into it. If it is not shown, the next time the dropdown
     #  is shown it'll get the actual colors anyway
@@ -261,6 +306,8 @@ proc ComboBox::cget { path option } {
 #  Command ComboBox::setvalue
 # ----------------------------------------------------------------------------
 proc ComboBox::setvalue { path index } {
+    variable _index
+
     set values [Widget::getMegawidgetOption $path -values]
     set value  [Entry::cget $path.e -text]
     switch -- $index {
@@ -297,6 +344,7 @@ proc ComboBox::setvalue { path index } {
     }
     if { $idx >= 0 && $idx < [llength $values] } {
         set newval [lindex $values $idx]
+        set _index($path) $idx
 	Entry::configure $path.e -text $newval
         return 1
     }
@@ -318,8 +366,17 @@ proc ComboBox::get { path } {
 #  Command ComboBox::getvalue
 # ----------------------------------------------------------------------------
 proc ComboBox::getvalue { path } {
+    variable _index
     set values [Widget::getMegawidgetOption $path -values]
     set value  [Entry::cget $path.e -text]
+    # Check if an index was saved by the last setvalue operation
+    # If this index still matches it is returned
+    # This is necessary for the case when values is not unique
+    if { $_index($path) >= 0 \
+        && $_index($path) < [llength $values] \
+        && $value eq [lindex $values $_index($path)]} {
+        return $_index($path)
+    }
 
     return [lsearch -exact $values $value]
 }
@@ -401,7 +458,7 @@ proc ComboBox::_create_popup { path } {
 	}
     }
 
-    if { $::tcl_platform(platform) == "unix" } {
+    if {[string equal [tk windowingsystem] "x11"]} {
 	set sbwidth 11
     } else {
 	set sbwidth 15
@@ -409,12 +466,15 @@ proc ComboBox::_create_popup { path } {
 
     toplevel            $shell -relief solid -bd 1
     wm withdraw         $shell
-    update idle
     wm overrideredirect $shell 1
-    wm transient        $shell [winfo toplevel $path]
-    catch { wm attributes $shell -topmost 1 }
+    # these commands cause the combobox to behave strangely on OS X
+    if {![string equal [tk windowingsystem] "aqua"]} {
+        update idle
+        wm transient    $shell [winfo toplevel $path]
+        catch { wm attributes $shell -topmost 1 }
+    }
 
-    set sw [ScrolledWindow $shell.sw -managed 0 -size $sbwidth -ipad 0]
+    set sw [ScrolledWindow $shell.sw -managed 1 -size $sbwidth -ipad 0]
 
     if {$bw} {
         set listb  [ListBox $shell.listb \
@@ -457,7 +517,7 @@ proc ComboBox::_create_popup { path } {
     pack $sw -fill both -expand yes
     $sw setwidget $listb
 
-    ::bind $listb <Return> "ComboBox::_select [list $path] \[%W curselection\]"
+    ::bind $listb <Return> "ComboBox::_select [list $path] \[$listb curselection\]"
     ::bind $listb <Escape>   [list ComboBox::_unmapliste $path]
     ::bind $listb <FocusOut> [list ComboBox::_focus_out $path]
 }
@@ -483,7 +543,7 @@ proc ComboBox::_recreate_popup { path } {
 	}
     }
 
-    if { $::tcl_platform(platform) == "unix" } {
+    if { [string equal [tk windowingsystem] "x11"] } {
 	set sbwidth 11
     } else {
 	set sbwidth 15
@@ -502,7 +562,7 @@ proc ComboBox::_recreate_popup { path } {
 
     set listb $shell.listb
     destroy $shell.sw
-    set sw [ScrolledWindow $shell.sw -managed 0 -size $sbwidth -ipad 0]
+    set sw [ScrolledWindow $shell.sw -managed 1 -size $sbwidth -ipad 0]
     $listb configure \
             -height $h \
             -font   [Widget::cget $path -font] \
@@ -573,7 +633,9 @@ proc ComboBox::_mapliste { path } {
     wm deiconify $path.shell
     raise $path.shell
     BWidget::focus set $listb
-    BWidget::grab global $path
+    if { ! [string equal [tk windowingsystem] "aqua"] } {
+        BWidget::grab global $path
+    }
 }
 
 
@@ -581,15 +643,19 @@ proc ComboBox::_mapliste { path } {
 #  Command ComboBox::_unmapliste
 # ----------------------------------------------------------------------------
 proc ComboBox::_unmapliste { path {refocus 1} } {
+    # On aqua, state is zoomed, otherwise normal
     if {[winfo exists $path.shell] && \
-	    [string equal [wm state $path.shell] "normal"]} {
-        BWidget::grab release $path
-        BWidget::focus release $path.shell.listb $refocus
-	# Update now because otherwise [focus -force...] makes the app hang!
-	if {$refocus} {
-	    update
-	    focus -force $path.e
-	}
+      ( [string equal [wm state $path.shell] "normal"] ||
+	[string equal [wm state $path.shell] "zoomed"] ) } {
+        if {![string equal [tk windowingsystem] "aqua"]} {
+            BWidget::grab release $path
+            BWidget::focus release $path.shell.listb $refocus
+            # Update now because otherwise [focus -force...] makes the app hang!
+            if {$refocus} {
+                update
+                focus -force $path.e
+            }
+        }
         wm withdraw $path.shell
         ArrowButton::configure $path.a -relief raised
     }
@@ -611,7 +677,9 @@ proc ComboBox::_select { path index } {
         }
     }
     $path.e selection clear
-    $path.e selection range 0 end
+    if {[$path.e cget -exportselection]} {
+        $path.e selection range 0 end
+    }
 }
 
 
@@ -758,7 +826,7 @@ proc ComboBox::_auto_post { path key } {
         set x -1
     }
     if {([string length $key] > 1 && [string tolower $key] != $key) && \
-            [string equal $key "Backspace"] != 0 && \
+            [string equal $key "BackSpace"] != 0 && \
             [string equal $key "Up"] != 0 && \
             [string equal $key "Down"] != 0} {
         return
@@ -807,3 +875,11 @@ proc ComboBox::_auto_post { path key } {
         $path.shell.listb see $x
     }
 }
+# ------------------------------------------------------------------------------
+#  Command ComboBox::_destroy
+# ------------------------------------------------------------------------------
+proc ComboBox::_destroy { path } {
+    variable _index
+    Widget::destroy $path
+    unset _index($path)
+}