[PD-cvs] pd/src desire.tk,1.1.2.165,1.1.2.166

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
fixed File->Quit
added mousewheel support to spinboxes


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.165
retrieving revision 1.1.2.166
diff -C2 -d -r1.1.2.165 -r1.1.2.166
*** desire.tk	19 Apr 2006 14:18:24 -0000	1.1.2.165
--- desire.tk	20 Apr 2006 01:21:04 -0000	1.1.2.166
***************
*** 174,178 ****
  #end
  
! set history [History_new]
  
  #-----------------------------------------------------------------------------------#
--- 174,178 ----
  #end
  
! set history [History new]
  
  #-----------------------------------------------------------------------------------#
***************
*** 486,494 ****
  proc pdtk_watchdog {} {pd pd ping; after 2000 {pdtk_watchdog}}
  
- proc pdtk_check {x message} {
-     set answer [tk_messageBox -message $x -type yesno -icon question]
-     switch -- $answer {yes {pd $message}}
- }
- 
  set menu_windowlist {} 
  
--- 486,489 ----
***************
*** 573,577 ****
  
  proc menu_really_quit {} {pd pd quit}
! proc menu_quit {} {pdtk_check "Do you really wish to quit?" {pd quit}}
  proc menu_pop_pd {} {raise .}
  proc menu_audio {flag} {pd pd dsp $flag}
--- 568,576 ----
  
  proc menu_really_quit {} {pd pd quit}
! def Client quit {} {
!     set answer [tk_messageBox -message "Do you really wish to quit?" -type yesno -icon question]
!     switch -- $answer {yes {pd pd quit; exit}}
! }
! 
  proc menu_pop_pd {} {raise .}
  proc menu_audio {flag} {pd pd dsp $flag}
***************
*** 1918,1927 ****
        }
        move {
!       	puts "something moved ::: $@selection"
! 	
  	foreach obj $@selection {
! 	##this could be wrong....
! 	mset {x y} [$obj xy]
! 	pd .$self object_moveto !$obj $x $y
  	}
  	
--- 1917,1925 ----
        }
        move {
! 	puts "something moved ::: $@selection"
  	foreach obj $@selection {
! 	  #this could be wrong....
! 	  mset {x y} [$obj xy]
! 	  pd .$self object_moveto !$obj $x $y
  	}
  	
***************
*** 2482,2487 ****
  }
  
- def Thing == {other} {return [expr ![string compare $self $other]]}
- 
  def* numbox draw {} {
  	$self update_size
--- 2480,2483 ----
***************
*** 3385,3390 ****
  	    side {
  		frame $f
! 		label $f.label -text $label
! 		pack  $f.label -side left
  		frame $f.side -relief ridge -borderwidth 2
  		foreach {i side} {0 left 1 right 2 top 3 bottom} {
--- 3381,3385 ----
  	    side {
  		frame $f
! 		pack [label $f.label -text $label] -side left
  		frame $f.side -relief ridge -borderwidth 2
  		foreach {i side} {0 left 1 right 2 top 3 bottom} {
***************
*** 3416,3425 ****
  		frame $f
  		set i 0
! 		label $f.label -text [lindex $label 0]
! 		pack $f.label $f -side left
  		
  		set m [menu .popupMenu -tearoff 0]
  		foreach part [lrange $label 1 end] {
! 			$m add command -label $part -command [list dropmenu_set $f $part] 
  			#radiobutton $f.$i -text $part -value $i -variable _($self:$name) -anchor w
  			#pack $f.$i -side top -fill x
--- 3411,3419 ----
  		frame $f
  		set i 0
! 		pack [label $f.label -text [lindex $label 0]] $f -side left
  		
  		set m [menu .popupMenu -tearoff 0]
  		foreach part [lrange $label 1 end] {
! 			$m add command -label $part -command [list dropmenu_set $f $part]
  			#radiobutton $f.$i -text $part -value $i -variable _($self:$name) -anchor w
  			#pack $f.$i -side top -fill x
***************
*** 3442,3450 ****
  	    default {
  		frame $f
  		#label $f.label -text $label -wraplength 200 -justify left
  		
! 		label $f.label -text $label
  		balloon $f.label $name
! 		pack  $f.label -side left
  		eval "entry $f.entry -textvariable _($self:$name) $options"
  		pack $f.entry -side left
--- 3436,3445 ----
  	    default {
  		frame $f
+ 		#pack [label $f.label -text $label] -side left
  		#label $f.label -text $label -wraplength 200 -justify left
  		
! 		pack [label $f.label -text $label] -side left
  		balloon $f.label $name
! 
  		eval "entry $f.entry -textvariable _($self:$name) $options"
  		pack $f.entry -side left
***************
*** 3457,3460 ****
--- 3452,3457 ----
  			pack $f.b.1 $f.b.2 -side top
  			pack $f.b -side left
+ 			bind $f.entry <Button-4> "change_entry $f.entry +1"
+ 			bind $f.entry <Button-5> "change_entry $f.entry -1"
  		    }
  		    entry {}
***************
*** 3467,3471 ****
--- 3464,3472 ----
  	}
  	pack $f -side top -fill x
+ #<<<<<<< desire.tk
+ #	catch {$f.label configure -width 40 -anchor e}
+ #=======
  	catch {$f.label configure -width 45 -anchor nw}
+ #>>>>>>> 1.1.2.165
      }
  }
***************
*** 3701,3711 ****
  #c lsort proably does what u want (has an integer flag too)
  
! set manager [Manager_new]
  
  def Class post_hierarchy {{i 0}} {
    post %*s%s [expr $i*2] "" $self
!   foreach sub $@subclasses {
!     $sub post_hierarchy [expr $i+1]
!   }
  }
  Thing post_hierarchy
--- 3702,3710 ----
  #c lsort proably does what u want (has an integer flag too)
  
! set manager [Manager new]
  
  def Class post_hierarchy {{i 0}} {
    post %*s%s [expr $i*2] "" $self
!   foreach sub $@subclasses {$sub post_hierarchy [expr $i+1]}
  }
  Thing post_hierarchy