From 4dec70e1a663ea4a7a365ee1e324bda2074d306b Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 24 Oct 2024 08:12:22 +0200 Subject: [PATCH] gdk: Remove unused display vfunc But it's nice that everyone still implements it. --- gdk/broadway/gdkdisplay-broadway.c | 7 ------- gdk/gdkdisplayprivate.h | 1 - gdk/macos/gdkmacosdisplay.c | 8 -------- gdk/wayland/gdkdisplay-wayland.c | 7 ------- gdk/win32/gdkdisplay-win32.c | 1 - gdk/win32/gdkevents-win32.c | 8 -------- gdk/x11/gdkdisplay-x11.c | 7 ------- 7 files changed, 39 deletions(-) diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c index 47305ba54c..09a3c0c71a 100644 --- a/gdk/broadway/gdkdisplay-broadway.c +++ b/gdk/broadway/gdkdisplay-broadway.c @@ -257,12 +257,6 @@ gdk_broadway_display_flush (GdkDisplay *display) _gdk_broadway_server_flush (broadway_display->server); } -static gboolean -gdk_broadway_display_has_pending (GdkDisplay *display) -{ - return FALSE; -} - static void gdk_broadway_display_dispose (GObject *object) { @@ -485,7 +479,6 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class) display_class->beep = gdk_broadway_display_beep; display_class->sync = gdk_broadway_display_sync; display_class->flush = gdk_broadway_display_flush; - display_class->has_pending = gdk_broadway_display_has_pending; display_class->queue_events = _gdk_broadway_display_queue_events; display_class->get_next_serial = gdk_broadway_display_get_next_serial; diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h index 9d12855ada..6dcee1283a 100644 --- a/gdk/gdkdisplayprivate.h +++ b/gdk/gdkdisplayprivate.h @@ -154,7 +154,6 @@ struct _GdkDisplayClass void (*beep) (GdkDisplay *display); void (*sync) (GdkDisplay *display); void (*flush) (GdkDisplay *display); - gboolean (*has_pending) (GdkDisplay *display); void (*queue_events) (GdkDisplay *display); void (*make_default) (GdkDisplay *display); diff --git a/gdk/macos/gdkmacosdisplay.c b/gdk/macos/gdkmacosdisplay.c index 07d779051d..c16b98b776 100644 --- a/gdk/macos/gdkmacosdisplay.c +++ b/gdk/macos/gdkmacosdisplay.c @@ -270,13 +270,6 @@ gdk_macos_display_get_next_serial (GdkDisplay *display) return ++serial; } -static gboolean -gdk_macos_display_has_pending (GdkDisplay *display) -{ - return _gdk_event_queue_find_first (display) || - _gdk_macos_event_source_check_pending (); -} - static void gdk_macos_display_notify_startup_complete (GdkDisplay *display, const char *startup_notification_id) @@ -611,7 +604,6 @@ gdk_macos_display_class_init (GdkMacosDisplayClass *klass) display_class->get_next_serial = gdk_macos_display_get_next_serial; display_class->get_name = gdk_macos_display_get_name; display_class->get_setting = gdk_macos_display_get_setting; - display_class->has_pending = gdk_macos_display_has_pending; display_class->init_gl = gdk_macos_display_init_gl; display_class->notify_startup_complete = gdk_macos_display_notify_startup_complete; display_class->queue_events = gdk_macos_display_queue_events; diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 48a5f0acb7..83e5def2ba 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -901,12 +901,6 @@ gdk_wayland_display_make_default (GdkDisplay *display) display_wayland->startup_notification_id = g_strdup (startup_id); } -static gboolean -gdk_wayland_display_has_pending (GdkDisplay *display) -{ - return FALSE; -} - static gulong gdk_wayland_display_get_next_serial (GdkDisplay *display) { @@ -1073,7 +1067,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class) display_class->sync = gdk_wayland_display_sync; display_class->flush = gdk_wayland_display_flush; display_class->make_default = gdk_wayland_display_make_default; - display_class->has_pending = gdk_wayland_display_has_pending; display_class->queue_events = _gdk_wayland_display_queue_events; display_class->get_app_launch_context = _gdk_wayland_display_get_app_launch_context; display_class->get_next_serial = gdk_wayland_display_get_next_serial; diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index 70c7f2c389..8e32e38ebf 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -1365,7 +1365,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass) display_class->beep = gdk_win32_display_beep; display_class->sync = gdk_win32_display_sync; display_class->flush = gdk_win32_display_flush; - display_class->has_pending = _gdk_win32_display_has_pending; display_class->queue_events = _gdk_win32_display_queue_events; //? display_class->get_app_launch_context = _gdk_win32_display_get_app_launch_context; diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 2a114dc4dc..19aebba0c3 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -519,14 +519,6 @@ _gdk_events_init (GdkDisplay *display) set_up_low_level_keyboard_hook (display); } -gboolean -_gdk_win32_display_has_pending (GdkDisplay *display) -{ - return (_gdk_event_queue_find_first (display) || - (modal_win32_dialog == NULL && - GetQueueStatus (QS_ALLINPUT) != 0)); -} - #if 0 /* Unused, but might be useful to re-introduce in some debugging output? */ static char * diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index bcf6c581dd..2308e51493 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1852,12 +1852,6 @@ gdk_x11_display_flush (GdkDisplay *display) XFlush (GDK_DISPLAY_XDISPLAY (display)); } -static gboolean -gdk_x11_display_has_pending (GdkDisplay *display) -{ - return XPending (GDK_DISPLAY_XDISPLAY (display)); -} - /** * gdk_x11_display_get_default_group: * @display: (type GdkX11Display): a `GdkDisplay` @@ -3060,7 +3054,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) display_class->sync = gdk_x11_display_sync; display_class->flush = gdk_x11_display_flush; display_class->make_default = gdk_x11_display_make_default; - display_class->has_pending = gdk_x11_display_has_pending; display_class->queue_events = _gdk_x11_display_queue_events; display_class->get_app_launch_context = _gdk_x11_display_get_app_launch_context;