Changes in trunk/gui/scripts/textentry.tcl [17:22]

File:

• trunk/gui/scripts/textentry.tcl (modified) (8 diffs)

trunk/gui/scripts/textentry.tcl

@@ -22 +22 @@
     -*-helvetica-medium-r-normal-*-*-100-* widgetDefault
 
+#
+# Tk text widget doesn't honor Ctrl-V by default.  Get rid
+# of the default binding so that Ctrl-V works for <<Paste>>
+# as expected.
+#
+bind Text <Control-KeyPress-v> {}
+
 itcl::class Rappture::TextEntry {
     inherit itk::Widget
@@ -29 +36 @@
     itk_option define -height height Height 0
 
-    constructor {xmlobj path args} { # defined below }
+    constructor {owner path args} { # defined below }
 
     public method value {args}
@@ -40 +47 @@
 
     private variable _dispatcher "" ;# dispatcher for !events
-    private variable _xmlobj ""   ;# XML containing description
+    private variable _owner ""    ;# thing managing this control
     private variable _path ""     ;# path in XML to this number
 
@@ -53 +60 @@
 # CONSTRUCTOR
 # ----------------------------------------------------------------------
-itcl::body Rappture::TextEntry::constructor {xmlobj path args} {
-    if {![Rappture::library isvalid $xmlobj]} {
-        error "bad value \"$xmlobj\": should be Rappture::library"
-    }
-    set _xmlobj $xmlobj
+itcl::body Rappture::TextEntry::constructor {owner path args} {
+    if {[catch {$owner isa Rappture::ControlOwner} valid] != 0 || !$valid} {
+        error "bad object \"$owner\": should be Rappture::ControlOwner"
+    }
+    set _owner $owner
     set _path $path
 
@@ -64 +71 @@
     $_dispatcher dispatch $this !layout "[itcl::code $this _layout]; list"
 
-    set _size [$xmlobj get $path.size]
-
-    set hints [$xmlobj get $path.about.hints]
+    set _size [$_owner xml get $path.size]
+
+    set hints [$_owner xml get $path.about.hints]
     if {[string length $hints] > 0} {
         itk_component add hints {
@@ -80 +87 @@
     eval itk_initialize $args
 
-    set str [$xmlobj get $path.default]
+    set str [$_owner xml get $path.default]
     if {"" != $str} { value $str }
 }
@@ -160 +167 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::TextEntry::label {} {
-    set label [$_xmlobj get $_path.about.label]
+    set label [$_owner xml get $_path.about.label]
     if {"" == $label} {
         set label "String"
@@ -176 +183 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::TextEntry::tooltip {} {
-    set str [$_xmlobj get $_path.about.description]
+    set str [$_owner xml get $_path.about.description]
     return [string trim $str]
 }