diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-17 23:28:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-17 23:28:51 +0000 |
| commit | a036c6e59f27ce53950c64a7672fa2cf51b21f19 (patch) | |
| tree | 0518e9cea97df1e5d4aeca65be4d2ccc95a5447d /gtk/gtkimcontext.c | |
| parent | 3a3468024984ecb9617af5422c76e5a57240c9d0 (diff) | |
| download | gtk+-a036c6e59f27ce53950c64a7672fa2cf51b21f19.tar.gz | |
Make gtkmarshal.list/gtkmarshal.h only for compatibility with GTK+-1.2;
Sat Nov 17 18:26:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
only for compatibility with GTK+-1.2; and deprecate it;
put all marshalers we actually use into gtkmarshalers.list
and use the _gtk_marshal_ prefix for these marshalers.
Diffstat (limited to 'gtk/gtkimcontext.c')
| -rw-r--r-- | gtk/gtkimcontext.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 1e441682af..cc0aa32009 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -19,6 +19,7 @@ #include "gtkimcontext.h" #include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */ +#include "gtkmarshalers.h" #include "gtksignal.h" #include "string.h" @@ -96,7 +97,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_start), - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); im_context_signals[PREEDIT_END] = @@ -104,7 +105,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_end), - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); im_context_signals[PREEDIT_CHANGED] = @@ -112,7 +113,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_changed), - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); im_context_signals[COMMIT] = @@ -120,7 +121,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkIMContextClass, commit), - gtk_marshal_VOID__STRING, + _gtk_marshal_VOID__STRING, GTK_TYPE_NONE, 1, GTK_TYPE_STRING); @@ -130,7 +131,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) GTK_RUN_LAST, GTK_SIGNAL_OFFSET (GtkIMContextClass, retrieve_surrounding), _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__VOID, + _gtk_marshal_BOOLEAN__VOID, GTK_TYPE_BOOL, 0); im_context_signals[DELETE_SURROUNDING] = g_signal_new ("delete_surrounding", @@ -138,7 +139,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) GTK_RUN_LAST, GTK_SIGNAL_OFFSET (GtkIMContextClass, delete_surrounding), _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__INT_INT, + _gtk_marshal_BOOLEAN__INT_INT, GTK_TYPE_BOOL, 2, GTK_TYPE_INT, GTK_TYPE_INT); |