diff options
| author | Christian Hergert <chergert@redhat.com> | 2019-06-02 14:07:27 -0700 |
|---|---|---|
| committer | Christian Hergert <chergert@redhat.com> | 2019-06-02 14:24:51 -0700 |
| commit | 41e373f10cd727a9d87ca23ee5f72086451074e9 (patch) | |
| tree | 661274425a52b77454e19ac0b6c8ca36d86d25cf /gtk/gtkeventcontrollermotion.c | |
| parent | 1a4e360c2c289a4e3cb229310f24817234cd052b (diff) | |
| download | gtk+-41e373f10cd727a9d87ca23ee5f72086451074e9.tar.gz | |
gtk: fix all uses of g_cclosure_marshal_generic
This adds specific marshallers for all of the locations where a generic
marshaller is being used. It also provides va_marshallers to reduce the
chances that we get stack traces from perf going through ffi_call_unix64.
This is forward ported from gtk-3-24.
# Conflicts:
# gtk/gtkeventcontrollerkey.c
# gtk/gtkeventcontrollermotion.c
# gtk/gtkgesture.c
# gtk/gtkgesturemultipress.c
Diffstat (limited to 'gtk/gtkeventcontrollermotion.c')
| -rw-r--r-- | gtk/gtkeventcontrollermotion.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gtk/gtkeventcontrollermotion.c b/gtk/gtkeventcontrollermotion.c index dcf419c337..9ba9bdd627 100644 --- a/gtk/gtkeventcontrollermotion.c +++ b/gtk/gtkeventcontrollermotion.c @@ -31,6 +31,7 @@ #include "gtkintl.h" #include "gtkprivate.h" #include "gtkwidgetprivate.h" +#include "gtkmarshalers.h" #include "gtkeventcontrollerprivate.h" #include "gtkeventcontrollermotion.h" #include "gtktypebuiltins.h" @@ -256,13 +257,16 @@ gtk_event_controller_motion_class_init (GtkEventControllerMotionClass *klass) GTK_TYPE_EVENT_CONTROLLER_MOTION, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - NULL, + _gtk_marshal_VOID__DOUBLE_DOUBLE_ENUM_ENUM, G_TYPE_NONE, 4, G_TYPE_DOUBLE, G_TYPE_DOUBLE, GDK_TYPE_CROSSING_MODE, GDK_TYPE_NOTIFY_TYPE); + g_signal_set_va_marshaller (signals[ENTER], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__DOUBLE_DOUBLE_ENUM_ENUMv); /** * GtkEventControllerMotion::leave: @@ -277,11 +281,14 @@ gtk_event_controller_motion_class_init (GtkEventControllerMotionClass *klass) GTK_TYPE_EVENT_CONTROLLER_MOTION, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - NULL, + _gtk_marshal_VOID__ENUM_ENUM, G_TYPE_NONE, 2, GDK_TYPE_CROSSING_MODE, GDK_TYPE_NOTIFY_TYPE); + g_signal_set_va_marshaller (signals[LEAVE], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__ENUM_ENUMv); /** * GtkEventControllerMotion::motion: @@ -296,8 +303,11 @@ gtk_event_controller_motion_class_init (GtkEventControllerMotionClass *klass) GTK_TYPE_EVENT_CONTROLLER_MOTION, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - NULL, + _gtk_marshal_VOID__DOUBLE_DOUBLE, G_TYPE_NONE, 2, G_TYPE_DOUBLE, G_TYPE_DOUBLE); + g_signal_set_va_marshaller (signals[MOTION], + G_TYPE_FROM_CLASS (klass), + _gtk_marshal_VOID__DOUBLE_DOUBLEv); } static void |