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/gtklabel.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/gtklabel.c')
| -rw-r--r-- | gtk/gtklabel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 6781a83cdd..e6d55146b2 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -27,6 +27,7 @@ #include <string.h> #include "gtklabel.h" #include "gtkmain.h" +#include "gtkmarshalers.h" #include "gtksignal.h" #include "gtkwindow.h" #include "gdk/gdkkeysyms.h" @@ -256,7 +257,7 @@ gtk_label_class_init (GtkLabelClass *class) GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkLabelClass, move_cursor), - gtk_marshal_VOID__ENUM_INT_BOOLEAN, + _gtk_marshal_VOID__ENUM_INT_BOOLEAN, GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL); signals[COPY_CLIPBOARD] = @@ -264,7 +265,7 @@ gtk_label_class_init (GtkLabelClass *class) GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkLabelClass, copy_clipboard), - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); signals[POPULATE_POPUP] = @@ -272,7 +273,7 @@ gtk_label_class_init (GtkLabelClass *class) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkLabelClass, populate_popup), - gtk_marshal_VOID__OBJECT, + _gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, GTK_TYPE_MENU); g_object_class_install_property (G_OBJECT_CLASS(object_class), |