pd/src desire.tk,1.1.2.459,1.1.2.460 - Pd-cvs

6 Sep 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4201
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
fixing previous commit
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.459
retrieving revision 1.1.2.460
diff -C2 -d -r1.1.2.459 -r1.1.2.460
*** desire.tk	5 Sep 2006 23:01:06 -0000	1.1.2.459
--- desire.tk	5 Sep 2006 23:14:05 -0000	1.1.2.460
***************
*** 1115,1119 ****
def Canvas close {} {
- 	if {$@subpatch} {pd .$self close; after 10 $self delete; set @mapped 0; return}
    switch [tk_messageBox -message [say save_changes?] -icon question -type yesnocancel -default cancel] {
      yes    {$self save; pd .$self close}
--- 1115,1118 ----
***************
*** 1228,1236 ****
      set @editmode $mode
  #    catch {.$self.bbar.edit configure -image icon_mode_$mode}
!     if {[$self window]} {
        if {$mode} {set im icon_mode_edit} else {set im icon_mode_run}
        [$self window].bbar.edit configure -image $im
      }
-     if {[$self look hairstate] && !$@editmode} {$@crosshair erase}
      $self changed
      #!@#$ should update the checkbox in the editmenu
--- 1227,1235 ----
      set @editmode $mode
  #    catch {.$self.bbar.edit configure -image icon_mode_$mode}
!     if {$@mapped} {
        if {$mode} {set im icon_mode_edit} else {set im icon_mode_run}
        [$self window].bbar.edit configure -image $im
+       if {[$self look hairstate] && !$@editmode} {$@crosshair erase}
      }
      $self changed
      #!@#$ should update the checkbox in the editmenu
***************
*** 1238,1242 ****
def Canvas editmodeswitch {args} {$self editmode= [expr !$@editmode]}
! def Canvas window {} {return .$self}
  def Canvas widget {} {return .$self.c}
--- 1237,1244 ----
def Canvas editmodeswitch {args} {$self editmode= [expr !$@editmode]}
! def Canvas window {} {
! 	if {$@gop} {return [$@canvas window]}
! 	return .$self
! }
  def Canvas widget {} {return .$self.c}
***************
*** 1254,1257 ****
--- 1256,1260 ----
      lappend window_list $self
      set @mapped 0
+     set @gop 0
      set @name ""
      set @folder "???"
***************
*** 1335,1339 ****
        8  {set @gop 0; set @goprect 0}
        9  {set @gop [lindex $mess 8]; set @goprect 0}
! 	    10 {
    	set @gop [lindex $mess 8]
    	set @goprect 1
--- 1338,1342 ----
        8  {set @gop 0; set @goprect 0}
        9  {set @gop [lindex $mess 8]; set @goprect 0}
! 	    11 {
    	set @gop [lindex $mess 8]
    	set @goprect 1
***************
*** 1341,1357 ****
    	set @ymargin [lindex $mess 10]
        }
! 	    11 {
! 		    puts "MESS ==== $mess"
!        		set @gop [lindex $mess 9]
! 		set @goprect 1y
! 		set @xmargin [lindex $mess 9]
! 		set @ymargin [lindex $mess 10]
! 		puts "$self is a gop :::: $@gop"
! 		puts "xymargin:::: $@xmargin || $@ymargin"
! 		puts "x1 :: $@coordsx1 y1:: $@coordsy1"
! 		puts "x2 :: $@coordsx2 y2:: $@coordsy2"
! 	    }
            }
- 	  
    }
        }
--- 1344,1349 ----
    	set @ymargin [lindex $mess 10]
        }
! 	    default {error "what???"}
            }
    }
        }
***************
*** 1363,1367 ****
  }
- 
  def Canvas getscroll {} {}
--- 1355,1358 ----