[PD-cvs] pd/src desire.tk,1.1.2.273,1.1.2.274

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
fixed iolet rendering for MessageBox


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.273
retrieving revision 1.1.2.274
diff -C2 -d -r1.1.2.273 -r1.1.2.274
*** desire.tk	3 Jul 2006 17:30:08 -0000	1.1.2.273
--- desire.tk	3 Jul 2006 19:19:24 -0000	1.1.2.274
***************
*** 446,451 ****
  }
  
- puts $accels
- 
  ################## set up main window #########################
  
--- 446,449 ----
***************
*** 677,684 ****
  set untitled_directory [pwd]
  
- def Client init {} {
- 	super
- }
- 
  def Client new_file {} {
      global untitled_number untitled_directory
--- 675,678 ----
***************
*** 735,740 ****
  proc menu_audio {flag} {pd pd dsp $flag}
  
- #-----------------------------------------------------------------------------------#
- 
  def Menuable populate_menu {menu list} {
  	global key
--- 729,732 ----
***************
*** 747,752 ****
  }
  
- #-----------------------------------------------------------------------------------#
- 
  #################### the "File" menu for the Pd window ##############
  
--- 739,742 ----
***************
*** 767,777 ****
  $main init_menus
  
- # note: uplevel would be nice but with the supercalls we don't know how many levels up
  def* Menuable eval% {code} {
  	regsub -all %W $code $self code
! 	eval $code
  }
  
- 
  def* Menuable ctrlkey {key shift} {
      global accels
--- 757,765 ----
  $main init_menus
  
  def* Menuable eval% {code} {
  	regsub -all %W $code $self code
! 	uplevel [info level] $code
  }
  
  def* Menuable ctrlkey {key shift} {
      global accels
***************
*** 779,783 ****
      set key "Ctrl+$key"
      if {[dict exists $accels $key]} {
-     	puts "key ==== $key | cmd ===  [dict get $accels $key]"
  	$self eval% "%W [dict get $accels $key]"
  	return
--- 767,770 ----
***************
*** 787,792 ****
  def* Menuable altkey {key iso} {
      global accels
! 	#hum, where is shift?
!     #set key [if {$shift} {string toupper $key} {string tolower $key}]
      set key "Alt+$key"
      if {[dict exists $accels $key]} {
--- 774,778 ----
  def* Menuable altkey {key iso} {
      global accels
!     set key [if {$shift} {string toupper $key} {string tolower $key}]
      set key "Alt+$key"
      if {[dict exists $accels $key]} {
***************
*** 1367,1372 ****
      global look
      set nplus [expr $n==1 ? 1 : $n-1]
!     #mset {x1 y1} [$self xy]
!     mset {x1 y1 x2 y2} [.$@canvas.c bbox ${self}BASE]
      set xs [expr $x2-$x1]
      set ys [expr $y2-$y1]
--- 1353,1357 ----
      global look
      set nplus [expr $n==1 ? 1 : $n-1]
!     mset {x1 y1 x2 y2} [$self bbox]
      set xs [expr $x2-$x1]
      set ys [expr $y2-$y1]
***************
*** 1388,1393 ****
      global look
      set fy $look(iopos)
!     #mset {x1 y1} [$self xy]
!     mset {x1 y1 x2 y2} [.$@canvas.c bbox ${self}BASE]
      io_draw/2 $self i  $@ninlets [expr $y1-$fy-1]
      io_draw/2 $self o $@noutlets [expr $y2+$fy]
--- 1373,1377 ----
      global look
      set fy $look(iopos)
!     mset {x1 y1 x2 y2} [$self bbox]
      io_draw/2 $self i  $@ninlets [expr $y1-$fy-1]
      io_draw/2 $self o $@noutlets [expr $y2+$fy]
***************
*** 1403,1408 ****
      # text = the input text field
      # confusing?;)
-     # puts "metrics: [font metrics courier]"
-     #$self update_size
      global font look
      super
--- 1387,1390 ----
***************
*** 2854,2859 ****
  def* MessageBox init {args} {
  	super
- #	puts "!!!!!! args:$args"
- 	super
  	set @valid 0
  	set @w 15
--- 2836,2839 ----
***************
*** 2879,2884 ****
  	#comment out the following to see what happens with the q......
  	if {[info exists @isnew]} { 
! 	#if {$@isnew} {$self edit;lappend _($@canvas:selection) $self;set @isnew 0} 
! 	if {$@isnew} {$self edit;set @isnew 0; set @edit 1} 
  	}
  }
--- 2859,2864 ----
  	#comment out the following to see what happens with the q......
  	if {[info exists @isnew]} { 
! 		#if {$@isnew} {$self edit;lappend _($@canvas:selection) $self;set @isnew 0} 
! 		if {$@isnew} {$self edit;set @isnew 0; set @edit 1} 
  	}
  }