From e85bdba0c2644066958ad57b85317e59e3fd30f7 Mon Sep 17 00:00:00 2001 From: Anton Gorenko Date: Wed, 16 Jun 2010 12:48:46 +0600 Subject: [PATCH] gtk.ffi: add gtk_widget_destroy destructor; gobject.ffi: add g_signal_connect... macros-like words --- basis/gobject/ffi/ffi.factor | 11 +++++++++++ basis/gtk/ffi/ffi.factor | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor index a5b74e3aeb..c82ec75412 100644 --- 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 64d0b7f2ea..98ea4a408b 100644 --- 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 +