[PD-cvs] pd/src desire.tk,1.1.2.78,1.1.2.79
Mathieu Bouchard
matju at users.sourceforge.net
Sat Sep 24 04:04:19 CEST 2005
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25848
Modified Files:
Tag: devel_0_39
desire.tk
Log Message:
.
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.78
retrieving revision 1.1.2.79
diff -C2 -d -r1.1.2.78 -r1.1.2.79
*** desire.tk 23 Sep 2005 14:32:09 -0000 1.1.2.78
--- desire.tk 24 Sep 2005 02:04:16 -0000 1.1.2.79
***************
*** 72,79 ****
rename unknown _original_unknown
proc unknown {args} {
- #puts "!!! unknown $args"
global _
set self [lindex $args 0]
! if {[regexp match $self {^$}]} {error "null pointer you black emperor"}
set selector [lindex $args 1]
if {[llength [array names _ $self:_class]] == 0} {
--- 72,78 ----
rename unknown _original_unknown
proc unknown {args} {
global _
set self [lindex $args 0]
! if {"$self" == ""} {error "null pointer you black emperor"}
set selector [lindex $args 1]
if {[llength [array names _ $self:_class]] == 0} {
***************
*** 83,88 ****
set ancestors {}
lookup_method $_($self:_class) $selector methods ancestors
- #puts "!!! methods: $methods"
- # for use by uplevel:
set i 0
if {![llength $methods]} {
--- 82,85 ----
***************
*** 90,111 ****
}
set name [lindex $methods $i]
- #puts "proc name of $self $selector is $name"
set r [eval [concat [list $name $self] [lrange $args 2 end]]]
- #puts "!!! /unknown $args"
return $r
}
- # this one is broken (n'ajustez pas votre appareil)
proc super {args} {
! uplevel 0 {catch {puts "0: [info locals]"}}
! uplevel 1 {catch {puts "1: [info locals]"}}
! uplevel 2 {catch {puts "2: [info locals]"}}
! uplevel 3 {catch {puts "3: [info locals]"}}
! upvar 2 methods methods self self selector selector i oi
set i [expr 1+$oi]
- puts "!!! super #$i"
if {[llength $methods] < $i} {error "no more supermethods"}
set name [lindex $methods $i]
- puts "proc name of $self $selector is $name"
set r [eval [concat [list $name $self] $args]]
}
--- 87,99 ----
}
set name [lindex $methods $i]
set r [eval [concat [list $name $self] [lrange $args 2 end]]]
return $r
}
proc super {args} {
! upvar 2 methods methods self self i oi
set i [expr 1+$oi]
if {[llength $methods] < $i} {error "no more supermethods"}
set name [lindex $methods $i]
set r [eval [concat [list $name $self] $args]]
}
***************
*** 120,124 ****
set OS $tcl_platform(platform)
- #option add *background #ffffff
option add *foreground #000000
#option add *backgroundPixmap /usr/share/themes/BrushedMetalBlue/gtk/brushed-dark.xpm widgetDefault
--- 108,111 ----
***************
*** 129,135 ****
option add *$tkclass*borderWidth 1
}
! option add *Checkbutton*selectColor #dd3000
! option add *Radiobutton*selectColor #dd3000
!
foreach tkclass {Entry Text} {
option add *$tkclass*background #b0c4d8
--- 116,122 ----
option add *$tkclass*borderWidth 1
}
! foreach tkclass {CheckButton RadioButton} {
! option add *$tkclass*selectColor #dd3000
! }
foreach tkclass {Entry Text} {
option add *$tkclass*background #b0c4d8
***************
*** 186,219 ****
switch $OS {
! win32 {
! set pd_gui2 [file dirname $argv0]
! regsub -all \\\\ $pd_gui2 / pd_gui3
! set pd_guidir $pd_gui3/..
! set pd_tearoff 1
! }
! Darwin {
! set pd_gui2 [file dirname $argv0]
! set pd_guidir $pd_gui2/..
! set pd_tearoff 0
! }
default {set pd_tearoff 1}
}
- # hack so you can easily test-run this script in linux... define pd_guidir
- # (which is normally defined at startup in pd under linux...)
-
- switch $OS {
- unix {
- if {! [info exists pd_guidir]} {
- global pd_guidir
- puts stderr {setting pd_guidir to '.'}
- set pd_guidir .
- }
- }
- }
-
# it's unfortunate but we seem to have to turn off global bindings
# for Text objects to get control-s and control-t to do what we want for
! # "text" dialogs below. Also we have to get rid of tab's changing the focus.
bind all <Key-Tab> ""
--- 173,183 ----
switch $OS {
! Darwin {set pd_tearoff 0}
default {set pd_tearoff 1}
}
# it's unfortunate but we seem to have to turn off global bindings
# for Text objects to get control-s and control-t to do what we want for
! # "text" dialogs below. Also we have to get rid of tab's changing the focus.
bind all <Key-Tab> ""
More information about the Pd-cvs
mailing list