diff options
author | Guenter Geiger <ggeiger@users.sourceforge.net> | 2004-02-22 16:00:02 +0000 |
---|---|---|
committer | Guenter Geiger <ggeiger@users.sourceforge.net> | 2004-02-22 16:00:02 +0000 |
commit | 4af95e6d1963e319ed6bb1681a332ad654bdd1ef (patch) | |
tree | 63d42c0e25f0ad84963a0a0c264a93251cbea7a8 /pd/src/u_main.tk | |
parent | 74e28b058aaf629d94ad7d44a9add3062e89441d (diff) |
merged in version 0.37-1test6
svn path=/trunk/; revision=1329
Diffstat (limited to 'pd/src/u_main.tk')
-rw-r--r-- | pd/src/u_main.tk | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/pd/src/u_main.tk b/pd/src/u_main.tk index ef10c80b..6140c714 100644 --- a/pd/src/u_main.tk +++ b/pd/src/u_main.tk @@ -123,6 +123,11 @@ pack .controls.dio -side right -padx 20 bind . <Control-Key> {pdtk_pd_ctrlkey %W %K 0} bind . <Control-Shift-Key> {pdtk_pd_ctrlkey %W %K 1} +if {$pd_nt == 2} { + bind . <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} + bind . <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} +} + wm title . "Pd" . configure -menu .mbar -width 200 -height 150 @@ -924,6 +929,10 @@ proc pdtk_canvas_new {name width height geometry editable} { bind $name.c <Control-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} bind $name.c <Alt-Key> {pdtk_canvas_altkey %W %K %A} # bind $name.c <Mod1-Key> {puts stderr [concat mod1 %W %K %A]} + if {$pd_nt == 2} { + bind $name.c <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} + bind $name.c <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} + } bind $name.c <Key> {pdtk_canvas_key %W %K %A 0} bind $name.c <Shift-Key> {pdtk_canvas_key %W %K %A 1} bind $name.c <KeyRelease> {pdtk_canvas_keyup %W %K %A} @@ -2641,6 +2650,15 @@ proc pdtk_pd_startup {version apilist} { set width7 [font measure -*-courier-bold--normal--36-* x] set height7 [lindex [font metrics -*-courier-bold--normal--36-*] 5] + set tclpatch [info patchlevel] + if {$tclpatch == "8.3.0" || \ + $tclpatch == "8.3.1" || \ + $tclpatch == "8.3.2" || \ + $tclpatch == "8.3.3" } { + set oldtclversion 1 + } else { + set oldtclversion 0 + } pd [concat pd init [pdtk_enquote [pwd]] \ 8 $width1 $height1 \ 10 $width2 $height2 \ @@ -2649,7 +2667,7 @@ proc pdtk_pd_startup {version apilist} { 16 $width5 $height5 \ 24 $width6 $height6 \ 36 $width7 $height7 \ - \;]; + $oldtclversion \;]; # add the audio and help menus to the Pd window. We delayed this # so that we'd know the value of "apilist". |