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/gtkwindow.c | |
| parent | 3a3468024984ecb9617af5422c76e5a57240c9d0 (diff) | |
| download | gdk-pixbuf-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/gtkwindow.c')
| -rw-r--r-- | gtk/gtkwindow.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index a6153685c..de3e356ed 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -38,6 +38,7 @@ #include "gtkmain.h" #include "gtkiconfactory.h" #include "gtkintl.h" +#include "gtkmarshalers.h" enum { SET_FOCUS, @@ -454,7 +455,7 @@ gtk_window_class_init (GtkWindowClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWindowClass, set_focus), NULL, NULL, - gtk_marshal_VOID__OBJECT, + _gtk_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GTK_TYPE_WIDGET); @@ -464,7 +465,7 @@ gtk_window_class_init (GtkWindowClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWindowClass, frame_event), _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, + _gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); @@ -474,7 +475,7 @@ gtk_window_class_init (GtkWindowClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, GTK_SIGNAL_OFFSET (GtkWindowClass, activate_focus), NULL, NULL, - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -484,7 +485,7 @@ gtk_window_class_init (GtkWindowClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, GTK_SIGNAL_OFFSET (GtkWindowClass, activate_default), NULL, NULL, - gtk_marshal_VOID__VOID, + _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -494,7 +495,7 @@ gtk_window_class_init (GtkWindowClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, GTK_SIGNAL_OFFSET (GtkWindowClass, move_focus), NULL, NULL, - gtk_marshal_VOID__ENUM, + _gtk_marshal_VOID__ENUM, G_TYPE_NONE, 1, GTK_TYPE_DIRECTION_TYPE); |