diff options
author | Matthias Clasen <mclasen@redhat.com> | 2017-10-30 22:20:47 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2017-10-30 22:22:00 -0400 |
commit | f0189aecbc27b66fb6c860f729cf213c056687a2 (patch) | |
tree | fde37bd66c2ed5cc5543cd66df9e3ab3bbf72d28 | |
parent | f63d01b7820b35226cdef20fe57cf0d37c7bde98 (diff) | |
download | gtk+-f0189aecbc27b66fb6c860f729cf213c056687a2.tar.gz |
Drop gdk_event_set/get_screen
These functions have been replaced by display variants.
-rw-r--r-- | docs/reference/gdk/gdk4-sections.txt | 4 | ||||
-rw-r--r-- | gdk/gdkevents.c | 47 | ||||
-rw-r--r-- | gdk/gdkevents.h | 6 |
3 files changed, 2 insertions, 55 deletions
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 3f2d89aa76..a09df69f66 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -797,8 +797,8 @@ GdkEventFunc <SUBSECTION> gdk_get_show_events gdk_set_show_events -gdk_event_set_screen -gdk_event_get_screen +gdk_event_set_display +gdk_event_get_display gdk_event_get_device gdk_event_set_device gdk_event_get_source_device diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index f03af6eb7e..e3061848fe 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -2038,53 +2038,6 @@ gdk_events_get_center (GdkEvent *event1, return TRUE; } -/** - * gdk_event_set_screen: - * @event: a #GdkEvent - * @screen: a #GdkScreen - * - * Sets the screen for @event to @screen. The event must - * have been allocated by GTK+, for instance, by - * gdk_event_copy(). - * - * Since: 2.2 - **/ -void -gdk_event_set_screen (GdkEvent *event, - GdkScreen *screen) -{ - gdk_event_set_display (event, gdk_screen_get_display (screen)); -} - -/** - * gdk_event_get_screen: - * @event: a #GdkEvent - * - * Returns the screen for the event. The screen is - * typically the screen for `event->any.window`, but - * for events such as mouse events, it is the screen - * where the pointer was when the event occurs - - * that is, the screen which has the root window - * to which `event->motion.x_root` and - * `event->motion.y_root` are relative. - * - * Returns: (transfer none): the screen for the event - * - * Since: 2.2 - **/ -GdkScreen * -gdk_event_get_screen (const GdkEvent *event) -{ - GdkDisplay *display; - - display = gdk_event_get_display (event); - - if (display) - return gdk_display_get_default_screen (display); - - return NULL; -} - void gdk_event_set_display (GdkEvent *event, GdkDisplay *display) diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h index 92b05fa44a..ea81c58297 100644 --- a/gdk/gdkevents.h +++ b/gdk/gdkevents.h @@ -667,12 +667,6 @@ void gdk_event_handler_set (GdkEventFunc func, gpointer data, GDestroyNotify notify); -GDK_AVAILABLE_IN_ALL -void gdk_event_set_screen (GdkEvent *event, - GdkScreen *screen); -GDK_AVAILABLE_IN_ALL -GdkScreen *gdk_event_get_screen (const GdkEvent *event); - GDK_AVAILABLE_IN_3_94 void gdk_event_set_display (GdkEvent *event, GdkDisplay *display); |