diff options
| author | Michael Meeks <michael@ximian.com> | 2001-10-05 07:52:20 +0800 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2001-10-05 07:52:20 +0800 |
| commit | c5f392ca0e8b878206a012da11522125e1d86342 (patch) | |
| tree | 233134ebda3829cd036db9b66214cf8bd7415ef2 /e-util | |
| parent | 911659c6341a5376af81e7298219c0287c851ecc (diff) | |
| download | gsoc2013-evolution-c5f392ca0e8b878206a012da11522125e1d86342.tar gsoc2013-evolution-c5f392ca0e8b878206a012da11522125e1d86342.tar.gz gsoc2013-evolution-c5f392ca0e8b878206a012da11522125e1d86342.tar.bz2 gsoc2013-evolution-c5f392ca0e8b878206a012da11522125e1d86342.tar.lz gsoc2013-evolution-c5f392ca0e8b878206a012da11522125e1d86342.tar.xz gsoc2013-evolution-c5f392ca0e8b878206a012da11522125e1d86342.tar.zst gsoc2013-evolution-c5f392ca0e8b878206a012da11522125e1d86342.zip | |
add E_OBJECT_CLASS_ADD_SIGNALS and E_OBJECT_CLASS_TYPE to ease migration
2001-10-05 Michael Meeks <michael@ximian.com>
* gal/util/e-util.h: add E_OBJECT_CLASS_ADD_SIGNALS and
E_OBJECT_CLASS_TYPE to ease migration to Gnome 2.0 from
a single source base.
* All C files:
s/object_class->type,/E_OBJECT_CLASS_TYPE (object_class),/g;
s/gtk_object_class_add_signals([^\(]*)\(([^,]*),([^,]*),([^\)]*)/
E_OBJECT_CLASS_ADD_SIGNALS\1(\2,\3,\4/;
svn path=/trunk/; revision=13428
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-text-event-processor.c | 5 | ||||
| -rw-r--r-- | e-util/e-util.h | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index 6449b23463..466eb07888 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -20,6 +20,7 @@ */ #include "e-text-event-processor.h" +#include <gal/util/e-util.h> #include <gtk/gtksignal.h> static void e_text_event_processor_init (ETextEventProcessor *card); @@ -80,13 +81,13 @@ e_text_event_processor_class_init (ETextEventProcessorClass *klass) e_tep_signals[E_TEP_EVENT] = gtk_signal_new ("command", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextEventProcessorClass, command), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - gtk_object_class_add_signals (object_class, e_tep_signals, E_TEP_LAST_SIGNAL); + E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_tep_signals, E_TEP_LAST_SIGNAL); gtk_object_add_arg_type ("ETextEventProcessor::allow_newlines", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES); diff --git a/e-util/e-util.h b/e-util/e-util.h index 22b96a376a..179a2c2788 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -52,6 +52,16 @@ GtkType l##_get_type(void)\ return type;\ } +#if 1 +# define E_OBJECT_CLASS_ADD_SIGNALS(oc,sigs,last) \ + gtk_object_class_add_signals (oc, sigs, last) +# define E_OBJECT_CLASS_TYPE(oc) (oc)->type +#else +# define E_OBJECT_CLASS_ADD_SIGNALS(oc,sigs,last) +# define E_OBJECT_CLASS_TYPE(oc) G_TYPE_FROM_CLASS (oc) +#endif + + typedef enum { E_FOCUS_NONE, E_FOCUS_CURRENT, |