Changeset 630

Timestamp:

Dec 4, 2009 5:09:23 PM (11 years ago)

Author:

toby

Message:

# on 2002/07/18 20:50:04, toby did:
fix binding with yet newer versions of BLT

File:

• trunk/excledt.tcl (modified) (4 diffs, 3 props)

trunk/excledt.tcl

@@ -684 +684 @@
 proc exclEditMode {b bb} {
     global zoom graph
-    # get binding
-    set bindtag $graph(plot)
-    catch {
-        if {[bind bltZoomGraph] != ""} {
-            set bindtag bltZoomGraph
-        }
-    }
     # save the zoom and unzoom commands
     if [catch {set zoom(in)}] {
-        set zoom(in) [bind $bindtag <1>]
-        set zoom(out) [bind $bindtag <3>]
-    }
+        # get binding
+        set zoom(bindtag) $graph(plot)
+        catch {
+            if {[bind bltZoomGraph] != ""} {
+                set zoom(bindtag) bltZoomGraph
+            }
+        }
+        set zoom(in) [bind $zoom(bindtag) <1>]
+        set zoom(out) [bind $zoom(bindtag) <3>]
+        # check for really new BLT where binding is handled differently
+        if {$zoom(in) == ""} {
+            foreach zoom(bindtag) [bindtags $graph(plot)] {
+                set zoom(in) [bind $zoom(bindtag) <1>]
+                set zoom(out) [bind $zoom(bindtag) <3>]
+                if {$zoom(in) != ""} break
+            }
+        }
+    }
+        
     foreach c {1 2 3} {
         if {$c == $b} {
@@ -707 +716 @@
     if {[string trim [bind $graph(plot) <Motion>]] != ""} {
         if {[lindex [bind $graph(plot) <Motion>] 0] == "exclMove"} {
-            exclReset $bindtag
+            exclReset $zoom(bindtag)
         } else {
             blt::ResetZoom $graph(plot)
@@ -713 +722 @@
     }
     if {$b == 2} {
-        bind $bindtag <1> "exclAdd $bindtag %x %y"
+        bind $zoom(bindtag) <1> "exclAdd $zoom(bindtag) %x %y"
         $graph(plot) config -cursor arrow
     } elseif {$b == 3} {
-        bind $bindtag <1> "exclDel $bindtag %x %y"
+        bind $zoom(bindtag) <1> "exclDel $zoom(bindtag) %x %y"
         $graph(plot) config -cursor circle
     } else {
-        bind $bindtag <1> $zoom(in)
-        bind $bindtag <3> $zoom(out)
+        bind $zoom(bindtag) <1> $zoom(in)
+        bind $zoom(bindtag) <3> $zoom(out)
         $graph(plot) config -cursor crosshair
     }
@@ -1741 +1750 @@
     bind all <Control-KeyPress-c> {CheckChanges;destroy $graph(exclbox)}
     putontop $graph(exclbox)
+    wm deiconify $graph(exclbox)
     tkwait window $graph(exclbox)
     afterputontop