From 5d4895eb431adfbf2c7895d4257fa20a28f474f9 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Tue, 8 May 2001 04:56:03 +0000 Subject: Added util/e-sorter-array.lo and widgets/e-reflow-model.lo. Removed 2001-05-07 Christopher James Lahey * gal/Makefile.am (libgal_la_LIBADD): Added util/e-sorter-array.lo and widgets/e-reflow-model.lo. Removed widgets/e-reflow-sorted.lo. * gal/util/Makefile.am (libutil_la_SOURCES): Added e-sorter-array.c. (libgalinclude_HEADERS): Added e-sorter-array.h. * gal/util/e-sorter-array.c, gal/util/e-sorter-array.h: A sorter for use with a single compare function to do sorting. * gal/util/e-util.c, gal/util/e-util.h (e_marshal_INT__OBJECT_POINTER): Added this marshaller. * gal/widgets/Makefile.am (libwidgets_la_SOURCES): Added e-reflow-model.c. Removed e-reflow-sorted.c. (libwidgetsinclude_HEADERS): Added e-reflow-sorted.h. Removed e-reflow-model.h. * gal/widgets/e-reflow-model.c, gal/widgets/e-reflow-model.h: Model for EReflow. Has a number of items and generates canvas items on the fly. * gal/widgets/e-reflow.c, gal/widgets/e-reflow.h: Major rewrite. This now uses a model to generate its canvas items instead of having canvas items added to it. It doesn't create the canvas items now until they will be shown on screen. svn path=/trunk/; revision=9710 --- e-util/e-util.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'e-util/e-util.c') diff --git a/e-util/e-util.c b/e-util/e-util.c index 5bbb9522b4..d7770ac3fa 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -678,6 +678,27 @@ e_marshal_NONE__POINTER_INT_INT_INT (GtkObject *object, func_data); } +typedef int (*GtkSignal_INT__OBJECT_POINTER) (GtkObject *, + GtkObject *, gpointer, + gpointer user_data); +void +e_marshal_INT__OBJECT_POINTER (GtkObject *object, + GtkSignalFunc func, + gpointer func_data, + GtkArg *args) +{ + GtkSignal_INT__OBJECT_POINTER rfunc; + int *return_val; + + rfunc = (GtkSignal_INT__OBJECT_POINTER) func; + return_val = GTK_RETLOC_INT (args[2]); + + *return_val = (*rfunc) (object, + GTK_VALUE_OBJECT (args[0]), + GTK_VALUE_POINTER (args[1]), + func_data); +} + gchar** e_strsplit (const gchar *string, const gchar *delimiter, -- cgit v1.2.3