[PD-cvs] pd/src u_main.tk,1.1.1.4.2.7.4.16,1.1.1.4.2.7.4.17

[Mathieu Bouchard]

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

Modified Files:
      Tag: impd_0_37
	u_main.tk 
Log Message:
fixed canvas properties bug


Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.1.1.4.2.7.4.16
retrieving revision 1.1.1.4.2.7.4.17
diff -C2 -d -r1.1.1.4.2.7.4.16 -r1.1.1.4.2.7.4.17
*** u_main.tk	16 Mar 2004 21:54:02 -0000	1.1.1.4.2.7.4.16
--- u_main.tk	16 Mar 2004 22:36:23 -0000	1.1.1.4.2.7.4.17
***************
*** 976,983 ****
  		frame .$self.$name
  		label .$self.$name.label -text $label
  		button .$self.$name.color -text "      " -width 10 \
  			-command [list iemgui_choose_col .$self $name $label] \
! 			-relief sunken -background [format #%6.6x $_($self:$name)] \
! 			-highlightbackground       [format #%6.6x $_($self:$name)]
  		
  		button .$self.$name.preset -text "..." -command [list color_popup $self $name $i]
--- 976,985 ----
  		frame .$self.$name
  		label .$self.$name.label -text $label
+ 		# wtf, %6.6x sometimes gives me _8_ chars !?!
+ 		set c [expr $_($self:$name) & 0xFCFCFC]
  		button .$self.$name.color -text "      " -width 10 \
  			-command [list iemgui_choose_col .$self $name $label] \
! 			-relief sunken -background [format #%6.6x $c] \
! 			-highlightbackground       [format #%6.6x $c]
  		
  		button .$self.$name.preset -text "..." -command [list color_popup $self $name $i]
***************
*** 1447,1451 ****
  }
  
! proc canvas_cancel {id} {pd "$id cancel ;"]}
  proc canvas_ok {id} {canvas_apply $id; canvas_cancel $id}
  
--- 1449,1453 ----
  }
  
! proc canvas_cancel {id} {pd "$id cancel ;"}
  proc canvas_ok {id} {canvas_apply $id; canvas_cancel $id}
  
***************
*** 1466,1470 ****
      properties_dialog $self canvas_ok $props
  
!     checkbutton $id.graphme -text {graph on parent} -variable $var_canvas_graphme -anchor w
      pack $id.graphme -side top
      cancel_apply_ok $self canvas
--- 1468,1472 ----
      properties_dialog $self canvas_ok $props
  
!     checkbutton $id.graphme -text "graph on parent" -variable _($self:graphme) -anchor w
      pack $id.graphme -side top
      cancel_apply_ok $self canvas