gtk.ffi: add gtk_widget_destroy destructor; gobject.ffi: add g_signal_connect......

diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor
index a5b74e3aeb407291b8aca96b079fc25a9468f86d..c82ec75412885f42524509d89f8e14e9d4cc6978 100644 (file)
--- a/basis/gobject/ffi/ffi.factor
+++ b/basis/gobject/ffi/ffi.factor
@@ -60,3 +60,14 @@ CONSTANT: G_TYPE_BOXED $[ 18 2 shift ]
 CONSTANT: G_TYPE_PARAM $[ 19 2 shift ]
 CONSTANT: G_TYPE_OBJECT $[ 20 2 shift ]
 
+! Macros
+
+: g_signal_connect ( instance detailed_signal c_handler data -- result )
+    f 0 g_signal_connect_data ;
+
+: g_signal_connect_after ( instance detailed_signal c_handler data -- result )
+    f G_CONNECT_AFTER g_signal_connect_data ;
+
+: g_signal_connect_swapped ( instance detailed_signal c_handler data -- result )
+    f G_CONNECT_SWAPPED g_signal_connect_data ;
+

diff --git a/basis/gtk/ffi/ffi.factor b/basis/gtk/ffi/ffi.factor
index 64d0b7f2eac1432ffcebaf4e3ba16ad4cc0769f9..98ea4a408b8659471e7d056ae9f0fb706231b658 100644 (file)
--- a/basis/gtk/ffi/ffi.factor
+++ b/basis/gtk/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.syntax alien.libraries cairo.ffi combinators 
-kernel system
+USING: alien alien.syntax alien.destructors alien.libraries
+cairo.ffi combinators kernel system
 gir atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
 gobject.ffi pango.ffi ;
 EXCLUDE: alien.c-types => pointer ;
@@ -24,3 +24,5 @@ IMPLEMENT-STRUCTS: GtkTreeIter ;
 
 GIR: vocab:gtk/Gtk-2.0.gir
 
+DESTRUCTOR: gtk_widget_destroy
+