[PD-cvs] pd/src desire.tk,1.1.2.130,1.1.2.131

[Mathieu Bouchard]

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

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.130
retrieving revision 1.1.2.131
diff -C2 -d -r1.1.2.130 -r1.1.2.131
*** desire.tk	1 Dec 2005 16:56:44 -0000	1.1.2.130
--- desire.tk	2 Dec 2005 01:54:00 -0000	1.1.2.131
***************
*** 551,562 ****
  proc menu_send {} {
      toplevel .sendpanel
!     pack [entry .sendpanel.entry -textvariable send_textvariable] -side bottom -fill both -ipadx 100
!     .sendpanel.entry select from 0
!     .sendpanel.entry select adjust end
!     bind .sendpanel.entry <KeyPress-Return> {
!     	pd $send_textvariable
!     	after 50 {destroy .sendpanel}
!     }
!     focus .sendpanel.entry
  }
  
--- 551,560 ----
  proc menu_send {} {
      toplevel .sendpanel
!     set e .sendpanel.entry
!     pack [entry $e -textvariable send_textvar] -side bottom -fill both -ipadx 100
!     $e select from 0
!     $e select adjust end
!     bind $e <KeyPress-Return> {pd $send_textvar; after 50 {destroy .sendpanel}}
!     focus $e
  }
  
***************
*** 566,576 ****
  proc menu_audio {flag} {pd pd dsp $flag}
  
! proc menu_close {name} {
! 	foreach to_kill [winfo children $name] {
! 		destroy $to_kill
! 	}
! 	#destroy $name
  	pd $name menuclose 0
! 	fixwindowmenu
  }
  
--- 564,572 ----
  proc menu_audio {flag} {pd pd dsp $flag}
  
! def canvas close {} {
! 	#foreach to_kill [winfo children $name] {destroy $to_kill}
! 	##destroy $name
  	pd $name menuclose 0
! 	$self fix_window_menu
  }
  
***************
*** 579,584 ****
  	global accels
  	foreach e $list {
! 	  if {[llength $e]==0} {$menu add separator} {
  	    set cmd [lindex $e 1]
  	    set accel [accel_munge [lindex $e 2]]
  	    regsub -all %W $cmd $context cmd
--- 575,583 ----
  	global accels
  	foreach e $list {
! 	  if {[llength $e]==0} {
! 	    $menu add separator
! 	  } {
  	    set cmd [lindex $e 1]
+ 	    if {![llength $cmd]} {set cmd "%W [lindex $e 0]"}
  	    set accel [accel_munge [lindex $e 2]]
  	    regsub -all %W $cmd $context cmd
***************
*** 719,723 ****
  class_new canvas {view}
  
! def canvas close  {} {pd $name menuclose 0}
  def canvas save   {} {$self checkgeometry; pd $name menusave}
  def canvas saveas {} {$self checkgeometry; pd $name menusaveas}
--- 718,722 ----
  class_new canvas {view}
  
! #def canvas close  {} {pd $name menuclose 0}
  def canvas save   {} {$self checkgeometry; pd $name menusave}
  def canvas saveas {} {$self checkgeometry; pd $name menusaveas}
***************
*** 730,742 ****
  set canvasmenu(file) {
  	{New     {menu_new} "Ctrl+n"}
! 	{Open    {menu_open} "Ctrl+o"}
  	{}
! 	{Message {menu_send} "Ctrl+m"}
! 	{Path... {pd pd start-path-dialog} {}}
  	{}
! 	{Close   {menu_close} "Ctrl+w"}
! 	{Save    {menu_save} "Ctrl+s"}
  	{"Save as..." {menu_saveas} "Ctrl+S"}
! 	{Print   {menu_print} "Ctrl+p"}
  	{}
  	{Quit    {menu_quit} "Ctrl+q"}
--- 729,741 ----
  set canvasmenu(file) {
  	{New     {menu_new} "Ctrl+n"}
! 	{Open... {menu_open} "Ctrl+o"}
  	{}
! 	{Message... {menu_send} "Ctrl+m"}
! 	{Paths...   {pd pd start-path-dialog} {}}
  	{}
! 	{Close        {} "Ctrl+w"}
! 	{Save         {menu_save} "Ctrl+s"}
  	{"Save as..." {menu_saveas} "Ctrl+S"}
! 	{"Print..."   {menu_print} "Ctrl+p"}
  	{}
  	{Quit    {menu_quit} "Ctrl+q"}
***************
*** 879,883 ****
  	{"Help"       {popup_help       [c2self %W]} ""}
      }
!     wm protocol $name WM_DELETE_WINDOW "menu_close $name"
      $self new_binds
      focus $c
--- 878,882 ----
  	{"Help"       {popup_help       [c2self %W]} ""}
      }
!     wm protocol $name WM_DELETE_WINDOW "$self close"
      $self new_binds
      focus $c