[PD-cvs] pd/src desire.tk,1.1.2.579,1.1.2.580

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
small cleanup.


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.579
retrieving revision 1.1.2.580
diff -C2 -d -r1.1.2.579 -r1.1.2.580
*** desire.tk	21 Nov 2006 02:46:32 -0000	1.1.2.579
--- desire.tk	21 Nov 2006 07:01:34 -0000	1.1.2.580
***************
*** 1078,1087 ****
  def View delete {} {
  	if {[$self class] == "Canvas"} {
! 		#if {[$self subpatch]} {
! 		#} else {
! 	      	#}
! 	} else {
! 	$self erase
! 	}
  }
  def View erase {} {$self item_delete}
--- 1078,1082 ----
  def View delete {} {
  	if {[$self class] == "Canvas"} {
! 	} else {$self erase}
  }
  def View erase {} {$self item_delete}
***************
*** 1124,1132 ****
  	if {[info exists @gop]} {
  		if {$@gop} {
! 		set canvas $@canvas
! 		while {![winfo exists [$canvas widget]]} {
! 			set canvas [$canvas canvas]
! 		}
! 		return $canvas
  		}
  	}
--- 1119,1127 ----
  	if {[info exists @gop]} {
  		if {$@gop} {
! 			set canvas $@canvas
! 			while {![winfo exists [$canvas widget]]} {
! 				set canvas [$canvas canvas]
! 			}
! 			return $canvas
  		}
  	}
***************
*** 1396,1401 ****
      set @wires_pair {} ;# stores wires in the format of {0 1 1 0} id {1 1 2 0} id
  #    if {$@mapped} {$self init_window} ;#!@#$ @mapped can't possibly be 1 at this point
- #	    puts "                    mapped::: $@mapped"
- #	    puts "                       gop::: $@gop"
      set @history $history
      $self subscribe $manager
--- 1391,1394 ----
***************
*** 1513,1517 ****
  }
  
- 
  def Canvas gop_rect {} {
  	# 0 -1 1 1 90 95 10 20
--- 1506,1509 ----
***************
*** 1580,1584 ****
  
  #-----------------------------------------------------------------------------------#
! def Canvas search {} {  
  	if {$@find_break == [llength $@children]} {set @find_break 0}
  	for {} {$@find_break < [llength $@children]} {incr @find_break} {
--- 1572,1576 ----
  
  #-----------------------------------------------------------------------------------#
! def Canvas search {} {
  	if {$@find_break == [llength $@children]} {set @find_break 0}
  	for {} {$@find_break < [llength $@children]} {incr @find_break} {
***************
*** 1590,1594 ****
  			incr @find_break
  			break
! 			}
  	}
  }
--- 1582,1586 ----
  			incr @find_break
  			break
! 		}
  	}
  }
***************
*** 1737,1753 ****
  }
  
- 
  def Canvas chain_object {} {
  	if {[llength $@selection] == 1} {
- 
  		mset {x1 y1 x2 y2} [$@selection bbox]
  		set height [expr $y2 - $y1]
  		pd .$self "obj" $x1 [expr $y2 + 10]
  		set @action chain_obj
- 
  	} else {
  		return
  	}
- 
  }
  
--- 1729,1741 ----
***************
*** 1787,1791 ****
      $self populate_menu view {
  	reload redraw}
- #	{crosshair {global crosshair; set crosshair [expr !!$crosshair]} "" toggle}
      $self populate_menu put {
  	Object Message Number Symbol Comment {}
--- 1775,1778 ----
***************
*** 1793,1811 ****
  	Graph Array}
      $self populate_menu window {{}}
- 
      $m.edit add checkbutton -label [say edit_mode] \
      	-selectcolor grey0 -command "$self editmode 0" \
      	-accelerator [accel_munge "Ctrl+e"] -indicatoron 1 \
  	-variable @editmode -onvalue 1 -offvalue 0
- 
-     # what's this for??? --matju
-     #binds the state of the checkbox to global variable editmod
-     #if {![dict exists $accels "Ctrl+e"]} {
-     #	dict append accels $key(editmodeswitch) {[%W canvas] editmodeswitch}
-     #}
- 
      $m.edit   configure -postcommand "$self fix_edit_menu"
      $m.window configure -postcommand "$self fix_window_menu"
- 
      foreach x {file edit view find put window help} {
        if {$x=="find" || $x=="help"} {
--- 1780,1789 ----
***************
*** 1873,1877 ****
  }
  
- 
  def Canvas restack {} {
  	set c [$self get_canvas]
--- 1851,1854 ----
***************
*** 2246,2250 ****
  def Canvas visible_children {} {return $@visible_children}
  
- 
  def Canvas all_changed {} {
  	foreach x $@visible_children {
--- 2223,2226 ----