Get working on julia-0.3

Note we can't use the Compat package because this defines an internal Compat module!
JuliaGraphics · Sep 9, 2015 · fb9afb7 · fb9afb7
1 parent 61f90dd
commit fb9afb7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/events.jl b/src/events.jl
@@ -117,6 +117,12 @@ end
 
 const default_mouse_cb = (w, event)->nothing
 
+if VERSION < v"0.4.0-dev"
+typealias MHStack Vector{(Symbol,Function)}
+else
+typealias MHStack Vector{Tuple{Symbol,Function}}
+end
+
 type MouseHandler
     button1press::Function
     button1release::Function
@@ -127,7 +133,7 @@ type MouseHandler
     motion::Function
     button1motion::Function
     scroll::Function
-    stack::Vector{Tuple{Symbol,Function}}
+    stack::MHStack
     widget::GtkWidget
 
     MouseHandler() = new(default_mouse_cb, default_mouse_cb, default_mouse_cb,
@@ -136,6 +142,19 @@ type MouseHandler
                          Array(Tuple{Symbol,Function}, 0))
 end
 
+if VERSION < v"0.4.0-dev"
+typealias MHPair  (MouseHandler,Symbol)
+function findlast(testf::Function, A)
+    for i = length(A):-1:1
+        testf(A[i]) && return i
+    end
+    0
+end
+
+else
+typealias MHPair  Tuple{MouseHandler,Symbol}
+end
+
 function mousedown_cb(ptr::Ptr, eventp::Ptr, this::MouseHandler)
     event = unsafe_load(eventp)
     if event.button == 1
@@ -176,14 +195,14 @@ function mousescroll_cb(ptr::Ptr, eventp::Ptr, this::MouseHandler)
 end
 
 
-function push!(mh_evt::Tuple{MouseHandler,Symbol}, func::Function)
+function push!(mh_evt::MHPair, func::Function)
     mh, evt = mh_evt
     push!(mh.stack, (evt, getfield(mh, evt)))
     setfield!(mh, evt, func)
     mh
 end
 
-function pop!(mh_evt::Tuple{MouseHandler,Symbol})
+function pop!(mh_evt::MHPair)
     mh, evt = mh_evt
     idx = findlast(x->x[1]==evt, mh.stack)
     if idx != 0

diff --git a/test/gui.jl b/test/gui.jl
@@ -538,8 +538,8 @@ showall(w)
 io = IOBuffer()
 c.mouse.button1press = (widget,evt) -> println(io, "cb1_1")
 c.mouse.button2press = (widget,evt) -> println(io, "cb2_1")
-press1=Gtk.GdkEventButton(Gtk.GdkEventType.BUTTON_PRESS, Gtk.gdk_window(c), Int8(0), UInt32(0), 0.0, 0.0, convert(Ptr{Float64},C_NULL), UInt32(0), UInt32(1), C_NULL, 0.0, 0.0)
-press2=Gtk.GdkEventButton(Gtk.GdkEventType.BUTTON_PRESS, Gtk.gdk_window(c), Int8(0), UInt32(0), 0.0, 0.0, convert(Ptr{Float64},C_NULL), UInt32(0), UInt32(2), C_NULL, 0.0, 0.0)
+press1=Gtk.GdkEventButton(Gtk.GdkEventType.BUTTON_PRESS, Gtk.gdk_window(c), int8(0), uint32(0), 0.0, 0.0, convert(Ptr{Float64},C_NULL), uint32(0), uint32(1), C_NULL, 0.0, 0.0)
+press2=Gtk.GdkEventButton(Gtk.GdkEventType.BUTTON_PRESS, Gtk.gdk_window(c), int8(0), uint32(0), 0.0, 0.0, convert(Ptr{Float64},C_NULL), uint32(0), uint32(2), C_NULL, 0.0, 0.0)
 signal_emit(c, "button-press-event", Bool, press1)
 signal_emit(c, "button-press-event", Bool, press2)
 push!((c.mouse,:button1press), (widget,evt) -> println(io, "cb1_2"))
@@ -555,7 +555,7 @@ str = takebuf_string(io)
 @assert 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)
+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 = takebuf_string(io)
 @assert str == "scrolling\n"