fix for julia v1.5; jl_function_ptr was removed

JuliaGraphics · Jun 3, 2020 · dfa02b1 · dfa02b1
1 parent 8a04aab
commit dfa02b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/GLib/GLib.jl b/src/GLib/GLib.jl
@@ -30,9 +30,11 @@ export @sigatom, cfunction_
 
 
 cfunction_(f, r, a::Tuple) = cfunction_(f, r, Tuple{a...})
-@noinline function cfunction_(f, r, a)
-    @nospecialize(f, r, a)
-    return ccall((:jl_function_ptr,:libjulia), Ptr{Cvoid}, (Any, Any, Any), f, r, a)
+
+@generated function cfunction_(f, R::Type{rt}, A::Type{at}) where {rt, at<:Tuple}
+    quote
+        @cfunction($(Expr(:$,:f)), $rt, ($(at.parameters...),))
+    end
 end
 
 # local function, handles Symbol and makes UTF8-strings easier

diff --git a/src/events.jl b/src/events.jl
@@ -35,19 +35,15 @@ end
 
 mutable struct Gtk_signal_motion{T}
     closure::T
-    callback::Ptr{Nothing}
+    callback::Base.CFunction
     include::UInt32
     exclude::UInt32
 end
 function notify_motion(p::Ptr{GObject}, eventp::Ptr{GdkEventMotion}, closure::Gtk_signal_motion{T}) where T
     event = unsafe_load(eventp)
     if event.state & closure.include == closure.include &&
        event.state & closure.exclude == 0
-        if isbitstype(T)
-            ret = ccall(closure.callback, Cint, (Ptr{GObject}, Ptr{GdkEventMotion}, T), p, eventp, closure.closure)
-        else
-            ret = ccall(closure.callback, Cint, (Ptr{GObject}, Ptr{GdkEventMotion}, Any), p, eventp, closure.closure)
-        end
+        ret = closure.callback.f(p, eventp, closure.closure)
     else
         ret = Int32(false)
     end