AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
Inspector: Add a missing event type

See merge request GNOME/gtk!5218
This commit is contained in:
Matthias Clasen 2022-11-16 19:24:54 +00:00
commit 501577196a
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/gdkevents.c
View File

@ -612,7 +612,6 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
GList *l;
GdkSurface *surface = NULL;
GdkDevice *device = NULL;
GdkEvent *last_event = NULL;
GList *scrolls = NULL;
GArray *history = NULL;
GdkScrollUnit scroll_unit = GDK_SCROLL_UNIT_WHEEL;
@ -645,9 +644,6 @@ gdk_event_queue_handle_scroll_compression (GdkDisplay *display)
scroll_unit != scroll_event->unit)
break;
if (!last_event)
last_event = event;
surface = event->surface;
device = event->device;
scroll_unit = scroll_event->unit;

4
gtk/gtkalertdialog.h
View File

@ -33,8 +33,8 @@ GDK_AVAILABLE_IN_4_10
G_DECLARE_FINAL_TYPE (GtkAlertDialog, gtk_alert_dialog, GTK, ALERT_DIALOG, GObject)
GDK_AVAILABLE_IN_4_10
GtkAlertDialog *gtk_alert_dialog_new (const char *format,
...) G_GNUC_PRINTF (1, 2);
GtkAlertDialog *gtk_alert_dialog_new (const char *format,
...) G_GNUC_PRINTF (1, 2);
GDK_AVAILABLE_IN_4_10
gboolean gtk_alert_dialog_get_modal (GtkAlertDialog *self);

5
gtk/inspector/recorder.c
View File

@ -1443,9 +1443,12 @@ event_type_name (GdkEventType type)
"Pad Button Release",
"Pad Rind",
"Pad Strip",
"Pad Group Mode"
"Pad Group Mode",
"Touchpad Hold",
};
G_STATIC_ASSERT (G_N_ELEMENTS (event_name) == GDK_EVENT_LAST);
return event_name[type];
}