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

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

Author: douglask
Date: Sun Feb 14 12:30:57 2010
New Revision: 4613

Modified:
   vic/branches/mpeg4/tcl/ui-resource.tcl
   vic/branches/mpeg4/tcl/ui-util.tcl

Log:
MacOS X Tcl/Tk 8.5 GUI fixes


Modified: vic/branches/mpeg4/tcl/ui-resource.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-resource.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-resource.tcl	Sun Feb 14 12:30:57 2010
@@ -145,6 +145,8 @@
 		foreach pal [array names tkPalette] {
 			option add *$pal $tkPalette($pal) 61
 		}
+	} elseif {[windowingsystem] == "aqua" && $::tk_version > 8.4} {
+		tk_setPalette systemSheetBackground
 	}
 
 	option add *Radiobutton.relief flat startupFile

Modified: vic/branches/mpeg4/tcl/ui-util.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-util.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-util.tcl	Sun Feb 14 12:30:57 2010
@@ -124,14 +124,13 @@
 		}
 		wm geometry $w +$x+$y
 		wm deiconify $w
+		raise $w
 	} elseif { [winfo ismapped $w] } {
 		wm withdraw $w
 	} else {
 		wm deiconify $w
+		raise $w
 	}
-        if {[string match [ windowingsystem] "aqua"]} {
-           raise $w
-        }
 }
 
 proc create_toplevel { w title } {