[Sumover-dev] [svn commit] r4032 - in vic/branches/mpeg4: tcl

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

Author: piers
Date: Fri May 11 00:21:26 2007
New Revision: 4032

Modified:
   vic/branches/mpeg4/Makefile.in
   vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl

Log:
More tweaks to get make tcl happy on OSX and Linux - basically the new proc windowingsystem is needed in a few places so its been defined twice - in ui-ctrlmenu and ui-util - it seems osx likes it one way and linuc the other so a compromise is necessary


Modified: vic/branches/mpeg4/Makefile.in
==============================================================================
--- vic/branches/mpeg4/Makefile.in	(original)
+++ vic/branches/mpeg4/Makefile.in	Fri May 11 00:21:26 2007
@@ -103,9 +103,8 @@
 #
 # Remember to add a dependency if you add any tcl sources here.
 #
-TCL_VIC = ui-util.tcl ui-ctrlmenu.tcl ui-main.tcl ui-resource.tcl \
-	  ui-relate.tcl  ui-titlemaker.tcl \
-	ui-srclist.tcl ui-stats.tcl  ui-windows.tcl \
+TCL_VIC = ui-ctrlmenu.tcl ui-main.tcl ui-resource.tcl ui-relate.tcl \
+	ui-titlemaker.tcl ui-srclist.tcl ui-stats.tcl ui-util.tcl ui-windows.tcl \
 	ui-switcher.tcl ui-extout.tcl ui-grabber.tcl ui-unix.tcl \
 	cf-main.tcl cf-tm.tcl cf-confbus.tcl cf-network.tcl cf-util.tcl \
 	tkerror.tcl entry.tcl accessgrid.tcl ag-pixrate.tcl autoplace_ui.tcl

Modified: vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-ctrlmenu.tcl	Fri May 11 00:21:26 2007
@@ -30,7 +30,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-
+proc windowingsystem { } {
+    if { [ catch {set tkws [tk windowingsystem]}] } {
+            set tkws x11
+    }
+    return $tkws
+}
 
 proc fork_histtolut { } {
 	global V