diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-11 17:10:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-11 21:47:00 +0200 |
| commit | 44aa5c8970648d4319e54930177bb783855c5b3b (patch) | |
| tree | 1173df805d8743484a44220634701ea009a7bc66 /vcl | |
| parent | 7b82727f0286d8ea2ee4d962750105022d839ead (diff) | |
Resolves: rhbz#1719378 wrong signature for GtkGestureLongPress::pressed
Change-Id: Ib4c47189d5c9c89433f0c7de194ebb9777dc7bac
Reviewed-on: https://gerrit.libreoffice.org/73829
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index f0d2bd96bc08..084339f96d70 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -269,7 +269,7 @@ class GtkSalFrame : public SalFrame guint time, gpointer frame); static void gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame); - static void gestureLongPress(GtkGestureLongPress* gesture, gpointer frame); + static void gestureLongPress(GtkGestureLongPress* gesture, gdouble x, gdouble y, gpointer frame); #else static gboolean signalExpose( GtkWidget*, GdkEventExpose*, gpointer ); void askForXEmbedFocus( sal_Int32 nTimecode ); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index c180c077bd19..888a7fb9aeb4 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2739,17 +2739,14 @@ void GtkSalFrame::gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdo } } -void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gpointer frame) +void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gdouble x, gdouble y, gpointer frame) { - GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - - if(pThis) + GdkEventSequence *sequence = gtk_gesture_single_get_current_sequence(GTK_GESTURE_SINGLE(gesture)); + if (gtk_gesture_get_point(GTK_GESTURE(gesture), sequence, &x, &y)) { - SalLongPressEvent aEvent; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - gdouble x, y; - GdkEventSequence *sequence = gtk_gesture_single_get_current_sequence(GTK_GESTURE_SINGLE(gesture)); - gtk_gesture_get_point(GTK_GESTURE(gesture), sequence, &x, &y); + SalLongPressEvent aEvent; aEvent.mnX = x; aEvent.mnY = y; |