diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2020-07-30 14:30:57 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2020-07-30 18:30:13 +0200 |
commit | 9912c80d70cc7d7c331bbe1efbe430599675f6df (patch) | |
tree | 39de8d24c0700e584f46c174fe85ff1e134be4e1 | |
parent | 2f792396d70dca4ecf30b3a8192b745b0bc93ddf (diff) | |
download | gtk+-9912c80d70cc7d7c331bbe1efbe430599675f6df.tar.gz |
gdk: Drop gdk_device_get_associated_device()
Devices are no longer associated like this, the seat should be used
to resolve queries on other devices.
-rw-r--r-- | docs/reference/gdk/gdk4-sections.txt | 1 | ||||
-rw-r--r-- | gdk/gdkdevice.c | 42 | ||||
-rw-r--r-- | gdk/gdkdevice.h | 2 |
3 files changed, 0 insertions, 45 deletions
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 40e5378681..a438ee000c 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -352,7 +352,6 @@ gdk_device_get_name gdk_device_get_vendor_id gdk_device_get_product_id gdk_device_get_source -gdk_device_get_associated_device gdk_device_list_physical_devices gdk_device_get_device_type gdk_device_get_display diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index bdb2799c05..dabefc992d 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -86,7 +86,6 @@ enum { PROP_0, PROP_DISPLAY, PROP_NAME, - PROP_ASSOCIATED_DEVICE, PROP_TYPE, PROP_SOURCE, PROP_HAS_CURSOR, @@ -156,20 +155,6 @@ gdk_device_class_init (GdkDeviceClass *klass) G_PARAM_STATIC_STRINGS); /** - * GdkDevice:associated-device: - * - * Associated pointer or keyboard with this device, if any. Devices of - * type #GDK_DEVICE_TYPE_LOGICAL always come in keyboard/pointer pairs. - * Other device types will have a %NULL associated device. - */ - device_props[PROP_ASSOCIATED_DEVICE] = - g_param_spec_object ("associated-device", - P_("Associated device"), - P_("Associated pointer or keyboard with this device"), - GDK_TYPE_DEVICE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - /** * GdkDevice:source: * * Source type for the device. @@ -460,9 +445,6 @@ gdk_device_get_property (GObject *object, case PROP_DISPLAY: g_value_set_object (value, device->display); break; - case PROP_ASSOCIATED_DEVICE: - g_value_set_object (value, device->associated); - break; case PROP_NAME: g_value_set_string (value, device->name); break; @@ -670,30 +652,6 @@ gdk_device_get_display (GdkDevice *device) return device->display; } -/** - * gdk_device_get_associated_device: - * @device: a #GdkDevice - * - * Returns the #GdkDevice associated to @device: - * - * - if @device is of type %GDK_DEVICE_TYPE_LOGICAL, it will return - * the paired pointer or keyboard. - * - if @device is of type %GDK_DEVICE_TYPE_PHYSICAL, it will return - * the logical device to which @device is attached to. - * - if @device is of type %GDK_DEVICE_TYPE_FLOATING, %NULL will be - * returned, as there is no associated device. - * - * Returns: (nullable) (transfer none): The associated device, or - * %NULL - **/ -GdkDevice * -gdk_device_get_associated_device (GdkDevice *device) -{ - g_return_val_if_fail (GDK_IS_DEVICE (device), NULL); - - return device->associated; -} - static void _gdk_device_set_device_type (GdkDevice *device, GdkDeviceType type) diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index 644451a0bf..0cba90a495 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -115,8 +115,6 @@ GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_device_get_display (GdkDevice *device); GDK_AVAILABLE_IN_ALL -GdkDevice * gdk_device_get_associated_device (GdkDevice *device); -GDK_AVAILABLE_IN_ALL GList * gdk_device_list_physical_devices (GdkDevice *device); GDK_AVAILABLE_IN_ALL |