Merge pull request #7 from timholy/teh/signal_connect

Use more laborious signal_connect for destroy callback
JuliaGtk · May 10, 2016 · 016d9f0 · 016d9f0
2 parents 9ef4557 + e0773d6
commit 016d9f0
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/guidata.jl b/src/guidata.jl
@@ -38,15 +38,7 @@ function Base.setindex!(wd::GUIData, val, w, s::Symbol; raw::Bool=false)
     if d == empty_guidata
         d = wd.data[w] = Dict{Symbol,Any}()
         if isa(w, Gtk.GtkWidget)
-            signal_connect(w, "destroy") do widget
-                dct = wd.data[widget]
-                for (k,v) in dct
-                    if isa(v, AbstractState)
-                        disconnect(v)
-                    end
-                end
-                delete!(wd.data, widget)
-            end
+            signal_connect(destroy_callback, w, "destroy", Void, (), false, (w,wd))
         end
     end
     if !raw
@@ -59,6 +51,18 @@ function Base.setindex!(wd::GUIData, val, w, s::Symbol; raw::Bool=false)
     d[s] = val
 end
 
+@guarded function destroy_callback(widgetptr::Ptr, user_data)
+    widget, wd = user_data
+    dct = wd.data[widget]
+    for (k,v) in dct
+        if isa(v, AbstractState)
+            disconnect(v)
+        end
+    end
+    delete!(wd.data, widget)
+    nothing
+end
+
 Base.setindex!{T}(wd::GUIData, val, ws::@compat(Tuple{T,Symbol})) = wd.data[ws[1],ws[2]] = val
 
 Base.haskey(wd::GUIData, key) = haskey(wd.data, key)