[PD-cvs] pd/src desire.c, 1.1.2.217.2.195, 1.1.2.217.2.196 desire.tk, 1.1.2.600.2.323, 1.1.2.600.2.324

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18727

Modified Files:
      Tag: desiredata
	desire.c desire.tk 
Log Message:
remove objects_reinit


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.323
retrieving revision 1.1.2.600.2.324
diff -C2 -d -r1.1.2.600.2.323 -r1.1.2.600.2.324
*** desire.tk	8 Aug 2007 22:36:10 -0000	1.1.2.600.2.323
--- desire.tk	8 Aug 2007 23:23:52 -0000	1.1.2.600.2.324
***************
*** 2783,2791 ****
  }
  
- def Canvas objects_reinit {children} {
- 	eval [concat [list $@objects reinit] $children]
- 	$self changed children
- }
- 
  def Canvas visibles+= {child} {
  	if {[lsearch $@visibles $child]  < 0} {lappend @visibles $child; $self changed visibles}
--- 2783,2786 ----
***************
*** 4563,4571 ****
  	set s $::scale_amount
  	switch $mode { in { set s [expr 1/$s] }}
! 	if {[llength $@selection]} {
! 		set children [$@objectsel values]
! 	} else {
! 		set children [$@objects   values]
! 	}
  	foreach child $children {
  		mset {x y} [$child xy]
--- 4558,4563 ----
  	set s $::scale_amount
  	switch $mode { in { set s [expr 1/$s] }}
! 	set sel [$@objectsel values]
! 	if {![llength $sel]} {set sel [$@objects values]}
  	foreach child $children {
  		mset {x y} [$child xy]
***************
*** 4688,4692 ****
  def Canvas arrow_key {val1 val2} {
  	if {![$self editmode]} {
! 		if {[llength $@objectsel size] == 1} {
  			set o [$@selection values]
  			if {[[$o class] <= IEMGUI] || [[$o class] == FloatBox]} {$o key_incr $val1 $val2}
--- 4680,4684 ----
  def Canvas arrow_key {val1 val2} {
  	if {![$self editmode]} {
! 		if {[$@objectsel size] == 1} {
  			set o [$@selection values]
  			if {[[$o class] <= IEMGUI] || [[$o class] == FloatBox]} {$o key_incr $val1 $val2}
***************
*** 5027,5034 ****
  }
  
! def Wire index= {i} {
! 	super $i
! 	[$@canvas wires] set $i $self
! }
  
  def Wire init {mess} {
--- 5019,5024 ----
  }
  
! def  Box index= {i} {super $i; if {$@canvas != ""} {[$@canvas objects] set $i $self}}
! def Wire index= {i} {super $i;                      [$@canvas   wires] set $i $self }
  
  def Wire init {mess} {

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.195
retrieving revision 1.1.2.217.2.196
diff -C2 -d -r1.1.2.217.2.195 -r1.1.2.217.2.196
*** desire.c	8 Aug 2007 22:36:07 -0000	1.1.2.217.2.195
--- desire.c	8 Aug 2007 23:23:49 -0000	1.1.2.217.2.196
***************
*** 5977,5982 ****
  	t_binbuf *b = binbuf_new();
  	t_class *c = self->_class;
- 	int n;
- 	char *s;
  	t_text *x = (t_text *)self;
  	if (c==canvas_class) {
--- 5977,5980 ----
***************
*** 5995,5998 ****
--- 5993,5998 ----
  		c->savefn(self,b);
  	}
+ 	int n;
+ 	char *s;
  	appendix_save(self,b);
  	binbuf_gettext(b,&s,&n);
***************
*** 6007,6016 ****
  	free(s);
  	if (c==canvas_class) {
- 		// buffer overflow bug here
- 		char foo[8192];
  		t_canvas *can = (t_canvas *)self;
- 		char *bar=foo; *foo=0;
- 		canvas_each(y,can) bar+=sprintf(bar,"%ld x%lx ",y->dix->index,(long)y);
- 		sys_mgui(self,"objects_reinit","S",foo);
  		sys_mgui(self,"name=","s",can->name);
  		sys_mgui(self,"folder=","s",canvas_getenv(can)->dir);
--- 6007,6011 ----