summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-10-25 19:45:48 -0400
committerMatthias Clasen <mclasen@redhat.com>2016-10-25 19:45:48 -0400
commit5e4a05e5b7297090eabb74af2423895e2b0a2fe4 (patch)
treea5a165f0ec3e88611e726051b74a2ef3306a8e41
parent1396d6c92ac9735cd02efd99e937d4e4bb0cdbf8 (diff)
downloadgtk+-5e4a05e5b7297090eabb74af2423895e2b0a2fe4.tar.gz
Remove deprecated gdk_window_get_pointer
-rw-r--r--docs/reference/gdk/gdk4-sections.txt1
-rw-r--r--gdk/gdkwindow.c36
-rw-r--r--gdk/gdkwindow.h7
3 files changed, 0 insertions, 44 deletions
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index fd542ed197..4ff47d9719 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -438,7 +438,6 @@ gdk_window_get_root_origin
gdk_window_get_frame_extents
gdk_window_get_origin
gdk_window_get_root_coords
-gdk_window_get_pointer
gdk_window_get_device_position
gdk_window_get_device_position_double
GdkModifierType
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 548f4f0720..c46309cc4a 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -4347,42 +4347,6 @@ gdk_window_constrain_size (GdkGeometry *geometry,
}
/**
- * gdk_window_get_pointer:
- * @window: a #GdkWindow
- * @x: (out) (allow-none): return location for X coordinate of pointer or %NULL to not
- * return the X coordinate
- * @y: (out) (allow-none): return location for Y coordinate of pointer or %NULL to not
- * return the Y coordinate
- * @mask: (out) (allow-none): return location for modifier mask or %NULL to not return the
- * modifier mask
- *
- * Obtains the current pointer position and modifier state.
- * The position is given in coordinates relative to the upper left
- * corner of @window.
- *
- * Returns: (nullable) (transfer none): the window containing the
- * pointer, or %NULL if the window containing the pointer isn’t known to GDK
- *
- * Deprecated: 3.0: Use gdk_window_get_device_position() instead.
- **/
-GdkWindow*
-gdk_window_get_pointer (GdkWindow *window,
- gint *x,
- gint *y,
- GdkModifierType *mask)
-{
- GdkDisplay *display;
- GdkDevice *pointer;
-
- g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
- display = gdk_window_get_display (window);
- pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
-
- return gdk_window_get_device_position (window, pointer, x, y, mask);
-}
-
-/**
* gdk_window_get_device_position_double:
* @window: a #GdkWindow.
* @device: pointer #GdkDevice to query to.
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 9a887b7d57..4765303534 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -783,13 +783,6 @@ void gdk_window_get_frame_extents (GdkWindow *window,
GDK_AVAILABLE_IN_3_10
gint gdk_window_get_scale_factor (GdkWindow *window);
-#ifndef GDK_MULTIDEVICE_SAFE
-GDK_DEPRECATED_IN_3_0_FOR(gdk_window_get_device_position)
-GdkWindow * gdk_window_get_pointer (GdkWindow *window,
- gint *x,
- gint *y,
- GdkModifierType *mask);
-#endif /* GDK_MULTIDEVICE_SAFE */
GDK_AVAILABLE_IN_ALL
GdkWindow * gdk_window_get_device_position (GdkWindow *window,
GdkDevice *device,