[Sumover-dev] [svn commit] r3988 - vic/branches/mpeg4/tcl

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Mon Apr 16 01:13:36 2007
New Revision: 3988

Modified:
   vic/branches/mpeg4/tcl/ui-main.tcl
   vic/branches/mpeg4/tcl/ui-util.tcl
   vic/branches/mpeg4/tcl/ui-windows.tcl

Log:
Updates for correct running under Aqua Tcl/Tk on OSX:
- Removed -colormap option from a number of 'toplevel' calls - doesn't seem to be required and worked on Linux ok.
- Tested with ActiveState's Tcl ActiveTcl8.4.14.0.272572-macosx-universal-threaded.dmg
- Won't work with standard OSX 10.4 Aqua enabled Tcl/Tk as the TKPutImage function is not available.


Modified: vic/branches/mpeg4/tcl/ui-main.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-main.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-main.tcl	Mon Apr 16 01:13:36 2007
@@ -716,7 +716,7 @@
 	global V
 	set w $V(grid).$src
 	frame $w -relief groove -borderwidth 0 \
-		-visual $V(visual) -colormap $V(colormap)
+		-visual $V(visual)
 	#XXX color
 	build.src $w $src 1
 	grid $w -row $V(currow) -column $V(curcol) -sticky we

Modified: vic/branches/mpeg4/tcl/ui-util.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-util.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-util.tcl	Mon Apr 16 01:13:36 2007
@@ -136,7 +136,7 @@
 	global V
 	if [info exists V(visual)] {
 		toplevel $w -class $V(class) \
-			-visual $V(visual) -colormap $V(colormap)
+			-visual "$V(visual)"
 	} else {
 		toplevel $w -class $V(class)
 	}

Modified: vic/branches/mpeg4/tcl/ui-windows.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-windows.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-windows.tcl	Mon Apr 16 01:13:36 2007
@@ -186,8 +186,8 @@
 	}
 	set w .vw$uid
 	toplevel $w -class Vic \
-		-visual "[winfo visual .top] [winfo depth .top]" \
-		-colormap .top
+		-visual "[winfo visual .top] [winfo depth .top]" 
+#		-colormap .top
 	catch "wm resizable $w false false"
 	#
 	# make windows become x-y resizeable