Skip to content

Commit

Permalink
Merge pull request #95 from JuliaLang/tk/tuple
Browse files Browse the repository at this point in the history
Use Compat for 0.4 Tuple syntax
  • Loading branch information
tkelman committed Apr 23, 2015
2 parents a14df3e + b1ccde6 commit db9e19a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 1 addition & 2 deletions 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
6 changes: 5 additions & 1 deletion src/Tk.jl
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/widgets.jl
Expand Up @@ -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
Expand Down

0 comments on commit db9e19a

Please sign in to comment.