Merge pull request #285 from tkelman/tk/versions

Use isdefined and Compat instead of unspecific VERSION conditions

REQUIRE

@@ -4,5 +4,5 @@ Graphics 0.1
 BinDeps
 @windows WinRPM
 @osx Homebrew
-Compat 0.8.0
+Compat 0.9.5
 BaseTestNext

src/GLib/glist.jl

@@ -71,7 +71,7 @@ strides(list::LList) = (1,)
 stride(list::LList, k::Integer) = (k > 1 ? length(list) : 1)
 size(list::LList) = (length(list),)
 isempty{L}(list::LList{L}) = (unsafe_convert(Ptr{L}, list) == C_NULL)
-if VERSION > v"0.6.0-"
+if isdefined(Base, :iteratorsize)
     Base.iteratorsize{L <: LList}(::Type{L}) = Base.HasLength()
 end
 

test/gui.jl

@@ -3,12 +3,6 @@
 using Gtk.ShortNames, Gtk.GConstants, Gtk.Graphics
 import Gtk.deleteat!, Gtk.libgtk_version, Gtk.GtkToolbarStyle, Gtk.GtkFileChooserAction, Gtk.GtkResponseType
 using Compat
-if VERSION < v"0.6.0-"
-    take!(b::IOBuffer) = takebuf_array(b)
-    if VERSION < v"0.5.0-"
-        const String = Base.UTF8String
-    end
-end
 
 ## for FileFilter
 # This is just for testing, and be careful of garbage collection while using this
@@ -721,13 +715,13 @@ signal_emit(c, "button-press-event", Bool, press2)
 pop!((c.mouse,:button1press))
 signal_emit(c, "button-press-event", Bool, press1)
 signal_emit(c, "button-press-event", Bool, press2)
-str = String(take!(io))
+str = Compat.String(take!(io))
 @test str == "cb1_1\ncb2_1\ncb1_2\ncb2_1\ncb1_2\ncb2_2\ncb1_1\ncb2_2\n"
 
 c.mouse.scroll = (widget,event) -> println(io, "scrolling")
 scroll = Gtk.GdkEventScroll(Gtk.GdkEventType.SCROLL, Gtk.gdk_window(c), Int8(0), UInt32(0), 0.0, 0.0, UInt32(0), Gtk.GdkScrollDirection.UP, convert(Ptr{Float64},C_NULL), 0.0, 0.0, 0.0, 0.0)
 signal_emit(c, "scroll-event", Bool, scroll)
-str = String(take!(io))
+str = Compat.String(take!(io))
 @test str == "scrolling\n"
 
 destroy(w)