Changeset 6372 for trunk/lang

Timestamp:

Jun 2, 2016 3:41:01 PM (8 years ago)

Author:

dkearney

Message:

adding multichoice widget from the multichoice branch

Location:

trunk

Files:

• . (modified) (1 prop)
• lang/tcl/scripts/Makefile.in (modified) (1 diff)
• lang/tcl/scripts/objects/multichoice (copied) (copied from branches/multichoice/lang/tcl/scripts/objects/multichoice)
• lang/tcl/scripts/objects/multichoice/multichoice.png (copied) (copied from branches/multichoice/lang/tcl/scripts/objects/multichoice/multichoice.png)
• lang/tcl/scripts/objects/multichoice/multichoice.rp (copied) (copied from branches/multichoice/lang/tcl/scripts/objects/multichoice/multichoice.rp) (1 diff)

trunk/lang/tcl/scripts/Makefile.in

@@ -57 +57 @@
                 image \
                 integer \
+                multichoice \
                 note \
                 number \

trunk/lang/tcl/scripts/objects/multichoice/multichoice.rp

@@ -35 +35 @@
 
             # make sure that the default is really a choice
-            set defval [string trim $attr(default)]
             set found 0
-            foreach rec $attr(options) {
-                set label [string trim [lindex $rec 0]]
-                set value [string trim [lindex $rec 1]]
-                if {$defval eq $label || $defval eq $value} {
-                    set found 1
-                    break
+            set alldefvals [split $attr(default) ","]
+            foreach defval $alldefvals {
+                set defval [string trim $defval]
+                foreach rec $attr(options) {
+                    set label [string trim [lindex $rec 0]]
+                    set value [string trim [lindex $rec 1]]
+                    if {$defval eq $label || $defval eq $value} {
+                        incr found
+                        break
+                    }
                 }
             }
-            if {!$found} {
-                return [list error "Default value must be a label or value for one of the current choices."]
+            if {$found != [llength $alldefvals]} {
+                return [list error "Default value must be labels or values from one of the current choices."]
             }
         }