[PD-cvs] pd/src desire.tk,1.1.2.13,1.1.2.14

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
can delete/close canvas, also some stupid bug fix


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** desire.tk	25 Aug 2005 18:40:20 -0000	1.1.2.13
--- desire.tk	26 Aug 2005 04:46:41 -0000	1.1.2.14
***************
*** 277,281 ****
  # Odd little function to make better Mac accelerators
  proc accel_munge {acc} {
!     puts "accel_munge::: $acc"
  
      global pd_nt
--- 277,281 ----
  # Odd little function to make better Mac accelerators
  proc accel_munge {acc} {
!     #puts "accel_munge::: $acc"
  
      global pd_nt
***************
*** 310,314 ****
  
  	set canvas_id [format %x [expr 0x80f2b50 + $offset_canvas]]
! 	set canvas_id .$canvas_id
  	set offset_canvas [expr $offset_canvas + 1]
  
--- 310,314 ----
  
  	set canvas_id [format %x [expr 0x80f2b50 + $offset_canvas]]
! 	set canvas_id .x$canvas_id
  	set offset_canvas [expr $offset_canvas + 1]
  
***************
*** 386,392 ****
  }
  
  #-----------------------------------------------------------------------------------#
  proc populate_menu {menu context list} {
! 	puts "__populate_menu::: $menu $context $list"
  
  	global accels
--- 386,411 ----
  }
  
+ proc menu_close {name} {
+ 	puts "menu_close::: $name"
+ 	
+ 	
+ 	
+ 	foreach to_kill [winfo children $name] {
+ 		destroy $to_kill
+ 	}
+ 	
+ 	#destroy $name.c
+ 	
+ 	destroy $name
+ 	
+ 	
+ 	#pd "$name menuclose 0 ;"
+ 	
+ 	#pdtk_fixwindowmenu
+ }
+ 
  #-----------------------------------------------------------------------------------#
  proc populate_menu {menu context list} {
! 	#puts "__populate_menu::: $menu $context $list"
  
  	global accels
***************
*** 554,573 ****
  #-----------------------------------------------------------------------------------#
  # Odd little function to make better Mac accelerators
! proc accel_munge {acc} {
!     puts "accel_munge::: $acc"
! 
!     global pd_nt
!     if {$pd_nt == 2} {
!         set tmp [string toupper [string map {Ctrl Meta} $acc] end]
! 	if [string is upper [string index $acc end]] {
! 	    return Shift+$tmp
! 	} else {
! 	    return $tmp
! 	}
!     } else {
! 	return $acc
!     }
! }
! 
  #
  
--- 573,592 ----
  #-----------------------------------------------------------------------------------#
  # Odd little function to make better Mac accelerators
! #proc accel_munge {acc} {
!     #puts "accel_munge::: $acc"
! #
! #    global pd_nt
! #    if {$pd_nt == 2} {
! #        set tmp [string toupper [string map {Ctrl Meta} $acc] end]
! #	if [string is upper [string index $acc end]] {
! #	    return Shift+$tmp
! #	} else {
! #	    return $tmp
! #	}
! #    } else {
! #	return $acc
! #    }
! #}
! #
  #
  
***************
*** 738,741 ****
--- 757,761 ----
  proc pdtk_canvas_new {name width height geometry editable} {
      puts "pdtk_canvas_new::: $name $width $height $geometry $editable"
+     
  
      global pd_opendir pd_tearoff pd_nt cmdline canvasmenu _
***************
*** 757,760 ****
--- 777,784 ----
      scrollbar $name.scrollvert -command "$name.c yview"
      scrollbar $name.scrollhort -command "$name.c xview" -orient horizontal
+     
+     
+     #puts "$name.c"
+     
      #if {[string compare $cmdline(look) ""]} {
  	#make_button_bar $name.bbar $name
***************
*** 926,929 ****
--- 950,955 ----
      set _($self:current_y) 30
      
+     puts "pdtk_canvas_new::: $name $width $height $geometry $editable"
+     
  }
  
***************
*** 943,947 ****
  # LATER also cut/copy/paste
  proc menu_fixeditmenu {name} {
!     puts "menu_fixeeditmenu::: $name"
  
      #global pd_undoaction pd_redoaction pd_undocanvas
--- 969,973 ----
  # LATER also cut/copy/paste
  proc menu_fixeditmenu {name} {
!     #puts "menu_fixeeditmenu::: $name"
  
      #global pd_undoaction pd_redoaction pd_undocanvas
***************
*** 962,966 ****
  # message from Pd to update the currently available undo/redo action
  proc pdtk_undomenu {name undoaction redoaction} {
!     puts "pdtk_undomenu::: $name $undoaction $redoaction"
  
      #global pd_undoaction pd_redoaction pd_undocanvas
--- 988,992 ----
  # message from Pd to update the currently available undo/redo action
  proc pdtk_undomenu {name undoaction redoaction} {
!     #puts "pdtk_undomenu::: $name $undoaction $redoaction"
  
      #global pd_undoaction pd_redoaction pd_undocanvas
***************
*** 1228,1232 ****
  	-font [format -*-courier-medium--normal--%d-* $font_size]
  
! 	bind ${canvas}.${self}text <KeyRelease> {pdtk_text_key %W %x %y %K %A 0}
  
  	#$canvas create window 41 41 -window ${canvas}.${self}text -anchor nw\
--- 1254,1265 ----
  	-font [format -*-courier-medium--normal--%d-* $font_size]
  
! 	set _(self) $self
! 	bind ${canvas}.${self}text <KeyRelease> {
! 	
! 		global _
! 	
! 		pdtk_text_key $canvas.c $_(self) %W %x %y %K %A 0
! 		
! 		}
  
  	#$canvas create window 41 41 -window ${canvas}.${self}text -anchor nw\
***************
*** 1256,1260 ****
  
  #-----------------------------------------------------------------------------------#
! proc pdtk_text_key {widget x y key iso shift} {
  	global _ font
  	
--- 1289,1293 ----
  
  #-----------------------------------------------------------------------------------#
! proc pdtk_text_key {canvas self widget x y key iso shift} {
  	global _ font
  	
***************
*** 1265,1269 ****
  	$widget configure -width [expr $name_len + 1]
  
! 	#puts "$widget | $canvas | $self"
  	#puts "name_len: $name_len"
  	#puts "$self:state -> $_($self:state)"
--- 1298,1302 ----
  	$widget configure -width [expr $name_len + 1]
  
! 	puts "*** $widget | $canvas | $self ***"
  	#puts "name_len: $name_len"
  	#puts "$self:state -> $_($self:state)"