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/gtkmenushell.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/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index ffc1499b82..65626e0018 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -27,6 +27,7 @@ #include "gdk/gdkkeysyms.h" #include "gtkbindings.h" #include "gtkmain.h" +#include "gtkmarshalers.h" #include "gtkmenuitem.h" #include "gtktearoffmenuitem.h" /* FIXME */ #include "gtkmenushell.h" @@ -217,21 +218,21 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkMenuShellClass, deactivate), - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); menu_shell_signals[SELECTION_DONE] = gtk_signal_new ("selection-done", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkMenuShellClass, selection_done), - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); menu_shell_signals[MOVE_CURRENT] = gtk_signal_new ("move_current", GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkMenuShellClass, move_current), - gtk_marshal_VOID__ENUM, + _gtk_marshal_VOID__ENUM, GTK_TYPE_NONE, 1, GTK_TYPE_MENU_DIRECTION_TYPE); menu_shell_signals[ACTIVATE_CURRENT] = @@ -239,7 +240,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkMenuShellClass, activate_current), - gtk_marshal_VOID__BOOLEAN, + _gtk_marshal_VOID__BOOLEAN, GTK_TYPE_NONE, 1, GTK_TYPE_BOOL); menu_shell_signals[CANCEL] = @@ -247,7 +248,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkMenuShellClass, cancel), - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); binding_set = gtk_binding_set_by_class (klass); |