diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-10-22 16:45:48 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-10-27 14:17:52 +1300 |
| commit | aefa1ba61125a013c2c6103f50dc6de6bf5c16b6 (patch) | |
| tree | 02b4d8ade10dd27295c5d35f427bcea4315370ce /gdk | |
| parent | db04c1eda7b99e0c47b93c38504452c4c9e8ec09 (diff) | |
| download | gtk+-aefa1ba61125a013c2c6103f50dc6de6bf5c16b6.tar.gz | |
gdk: Deprecate gdk_display_get_screen
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkdisplay.c | 1 | ||||
| -rw-r--r-- | gdk/mir/gdkmireventsource.c | 2 | ||||
| -rw-r--r-- | gdk/mir/gdkmirwindowimpl.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkdevice-core-x11.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkdevice-xi2.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 892d6a73f9..29e359fcf6 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -1501,6 +1501,7 @@ gdk_display_get_n_screens (GdkDisplay *display) * Returns: (transfer none): the #GdkScreen object * * Since: 2.2 + * Deprecated: 3.20: There is only one screen; use gdk_display_get_default_screen() to get it. */ GdkScreen * gdk_display_get_screen (GdkDisplay *display, diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c index 5812481756..fe9fc70607 100644 --- a/gdk/mir/gdkmireventsource.c +++ b/gdk/mir/gdkmireventsource.c @@ -54,7 +54,7 @@ send_event (GdkWindow *window, GdkDevice *device, GdkEvent *event) gdk_event_set_device (event, device); gdk_event_set_source_device (event, device); - gdk_event_set_screen (event, gdk_display_get_screen (gdk_window_get_display (window), 0)); + gdk_event_set_screen (event, gdk_display_get_default_screen (gdk_window_get_display (window))); event->any.window = g_object_ref (window); display = gdk_window_get_display (window); diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c index 05bec83d4d..4690459c2c 100644 --- a/gdk/mir/gdkmirwindowimpl.c +++ b/gdk/mir/gdkmirwindowimpl.c @@ -282,7 +282,7 @@ send_event (GdkWindow *window, GdkDevice *device, GdkEvent *event) gdk_event_set_device (event, device); gdk_event_set_source_device (event, device); - gdk_event_set_screen (event, gdk_display_get_screen (gdk_window_get_display (window), 0)); + gdk_event_set_screen (event, gdk_display_get_default_screen (display)); event->any.window = g_object_ref (window); display = gdk_window_get_display (window); diff --git a/gdk/x11/gdkdevice-core-x11.c b/gdk/x11/gdkdevice-core-x11.c index 1c10a13954..7b8fbd981f 100644 --- a/gdk/x11/gdkdevice-core-x11.c +++ b/gdk/x11/gdkdevice-core-x11.c @@ -472,7 +472,7 @@ gdk_x11_device_core_window_at_position (GdkDevice *device, /* FIXME: untrusted clients case not multidevice-safe */ pointer_window = None; - screen = gdk_display_get_screen (display, 0); + screen = gdk_display_get_default_screen (display); toplevels = gdk_screen_get_toplevel_windows (screen); for (list = toplevels; list != NULL; list = list->next) { diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index a77002e700..624d2688d8 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -542,7 +542,7 @@ gdk_x11_device_xi2_window_at_position (GdkDevice *device, /* FIXME: untrusted clients case not multidevice-safe */ pointer_window = None; - screen = gdk_display_get_screen (display, 0); + screen = gdk_display_get_default_screen (display); toplevels = gdk_screen_get_toplevel_windows (screen); for (list = toplevels; list != NULL; list = list->next) { |