Merge pull request #95 from JuliaLang/tk/tuple

Use Compat for 0.4 Tuple syntax

Author: tkelman

REQUIRE

@@ -1,7 +1,6 @@
 julia 0.3
-Compat 0.3.5
+Compat 0.4.0
 Cairo
 Graphics 0.1
-Compat 0.0.2-
 BinDeps 0.2.2-
 @windows WinRPM

src/Tk.jl

@@ -16,7 +16,11 @@ using Base
 using Cairo
 using Compat
 
-include("../deps/deps.jl")
+if isfile(joinpath(dirname(@__FILE__),"..","deps","deps.jl"))
+    include("../deps/deps.jl")
+else
+    error("Tk not properly installed. Please run Pkg.build(\"Tk\")")
+end
 
 import Base: string, show, getindex, setindex!, isequal
 

src/widgets.jl

@@ -219,7 +219,7 @@ end
 
 
 get_items(widget::Tk_Combobox) =  widget.values
-function set_items{T}(widget::Tk_Combobox, items::Vector{(T,T)})
+function set_items{T}(widget::Tk_Combobox, items::Vector{@compat Tuple{T,T}})
     vals = cb_pluck_labels(items)
     configure(widget, values = vals)
     widget.values = items