Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21173
Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed a lot of super fixed some inheritances then FloatAtom objects can be moved on the canvas
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.262 retrieving revision 1.1.2.263 diff -C2 -d -r1.1.2.262 -r1.1.2.263 *** desire.tk 23 Jun 2006 10:04:22 -0000 1.1.2.262 --- desire.tk 25 Jun 2006 10:57:58 -0000 1.1.2.263 *************** *** 104,108 ****
class_new Observable {} ! def Observable init {} { set @subscribers {} } --- 104,109 ----
class_new Observable {} ! def Observable init {args} { ! eval [concat [list super] $args] set @subscribers {} } *************** *** 161,165 **** # adapted from matju's MetaRuby (UndoQueue.rb)
! class_new History
def History init {} { --- 162,166 ---- # adapted from matju's MetaRuby (UndoQueue.rb)
! class_new History {Thing}
def History init {} { *************** *** 427,431 ****
#class_new Client {Menuable View} ! class_new Client {Menuable}
set ctrls_audio_on 0 --- 428,432 ----
#class_new Client {Menuable View} ! class_new Client {Menuable Thing}
set ctrls_audio_on 0 *************** *** 653,657 ****
def Client init {} { ! #super }
--- 654,658 ----
def Client init {} { ! super }
*************** *** 900,903 **** --- 901,905 ----
#-----------------------------------------------------------------------------------# + #fixme: actually, is it ok that View<Menuable ? --matju class_new View {Menuable Observable Thing}
*************** *** 909,912 **** --- 911,915 ---- def View draw_wires {} {} def View init {} { + super set @selected? 0 set @ninlets 1 *************** *** 1917,1920 **** --- 1920,1924 ----
def StatusBar init {canvas} { + super set @canvas $canvas set f [$self widget] *************** *** 2857,2860 **** --- 2861,2865 ----
def* MessageBox init {args} { + super # puts "!!!!!! args:$args" super *************** *** 2920,2924 **** }
! class_new AtomBox {View Box} def* AtomBox draw {} { global look --- 2925,2931 ---- }
! # it was class_new AtomBox {View Box}, which is wrong because already Box<View ! # it shouldn't have mattered, but super doesn't support proper pruning yet ! class_new AtomBox {Box} def* AtomBox draw {} { global look *************** *** 3245,3248 **** --- 3252,3256 ---- class_new FloatAtom {AtomBox} def* FloatAtom init {args} { + super global font look eval [concat [list super] $args] *************** *** 3394,3397 **** --- 3402,3406 ---- class_new NumBox {Labeled Box} def* NumBox init {args} { + super eval [concat [list super] $args] set @clicking 0 *************** *** 4014,4018 **** ############ evaluator
! class_new Listener {}
def Listener init {serf name command} { --- 4023,4027 ---- ############ evaluator
! class_new Listener {Thing}
def Listener init {serf name command} { *************** *** 4218,4221 **** --- 4227,4231 ----
def* ClassBrowser init {name x y textbox} { + super set @name $name set @focus ".completion.comp" *************** *** 4729,4733 **** }
! class_new Dialog #what's the difference between ok and apply? def* Dialog ok {} {$self apply; $self cancel} --- 4739,4743 ---- }
! class_new Dialog {Thing} #what's the difference between ok and apply? def* Dialog ok {} {$self apply; $self cancel} *************** *** 4737,4740 **** --- 4747,4751 ----
def* Dialog init {} { + super set f .$self set @max_label 0 *************** *** 4833,4836 **** --- 4844,4848 ----
def SubPagedDialog init {} { + #fixme: every View's init should call super, no? --matju #super set f .$self