Changeset 3305 for branches/nanovis2/gui/scripts/combobox.tcl

Timestamp:

Feb 18, 2013, 2:32:14 PM (12 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• gui/scripts/combobox.tcl (modified) (6 diffs)

branches/nanovis2/gui/scripts/combobox.tcl

@@ -10 +10 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -36 +36 @@
     itk_option define -disabledbackground disabledBackground DisabledBackground ""
     itk_option define -disabledforeground disabledForeground DisabledForeground ""
+    itk_option define -interactcommand interactCommand InteractCommand ""
 
     constructor {args} { # defined below }
@@ -152 +153 @@
 itcl::body Rappture::Combobox::translate {value {defValue ""}} {
     foreach {val label} [choices get -both] {
-        if {$label == $value} {
+        if {$label eq $value} {
             return $val
         }
@@ -181 +182 @@
     set raw [$itk_component(entry) get]
     set value [translate $raw "badValue"]
-    if { $value != "badValue" } {
+    if { $value ne "badValue" } {
         return $value
     }
@@ -218 +219 @@
             if {$itk_option(-editable) && $itk_option(-state) == "normal"} {
                 event generate $itk_component(hull) <<Value>>
+                if {[string length $itk_option(-interactcommand)] > 0} {
+                    uplevel #0 $itk_option(-interactcommand)
+                }
             }
         }
@@ -262 +266 @@
         }
         select {
-            set val [$itk_component(ddlist) current -label]
-            if {"" != $val} {
-                value $val
+            set newval [$itk_component(ddlist) current -label]
+            set val [$itk_component(entry) get]
+            if {$newval ne "" && $newval ne $val} {
+                value $newval
+                if {[string length $itk_option(-interactcommand)] > 0} {
+                    uplevel #0 $itk_option(-interactcommand)
+                }
             }
         }