[gtk+/gdk-backend] Move gdk_devices_list to common code
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gdk-backend] Move gdk_devices_list to common code
- Date: Thu, 9 Dec 2010 04:45:46 +0000 (UTC)
commit 21842b60606e8fb033e6e053270f9c509ad603a7
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 8 23:45:10 2010 -0500
Move gdk_devices_list to common code
gdk/gdkdisplay.c | 16 ++++++++++++++++
gdk/quartz/gdkinput.c | 6 ------
gdk/win32/gdkinput.c | 6 ------
gdk/x11/gdkinput.c | 16 ----------------
4 files changed, 16 insertions(+), 28 deletions(-)
---
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 41a1ee1..e3800bd 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -2168,6 +2168,22 @@ gdk_display_list_devices (GdkDisplay *display)
}
/**
+ * gdk_devices_list:
+ *
+ * Returns the list of available input devices for the default display.
+ * The list is statically allocated and should not be freed.
+ *
+ * Return value: (transfer none) (element-type GdkDevice): a list of #GdkDevice
+ *
+ * Deprecated: 3.0: Use gdk_device_manager_list_devices() instead.
+ **/
+GList *
+gdk_devices_list (void)
+{
+ return gdk_display_list_devices (gdk_display_get_default ());
+}
+
+/**
* gdk_event_send_client_message_for_display:
* @display: the #GdkDisplay for the window where the message is to be sent.
* @event: the #GdkEvent to send, which should be a #GdkEventClient.
diff --git a/gdk/quartz/gdkinput.c b/gdk/quartz/gdkinput.c
index 31d1bd2..d85c333 100644
--- a/gdk/quartz/gdkinput.c
+++ b/gdk/quartz/gdkinput.c
@@ -49,12 +49,6 @@ GList *_gdk_input_devices;
GList *
-gdk_devices_list (void)
-{
- return _gdk_input_devices;
-}
-
-GList *
gdk_display_list_devices (GdkDisplay *dpy)
{
return _gdk_input_devices;
diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c
index 32de7fc..432558f 100644
--- a/gdk/win32/gdkinput.c
+++ b/gdk/win32/gdkinput.c
@@ -45,12 +45,6 @@ GList *_gdk_input_devices;
GList *_gdk_input_windows;
GList *
-gdk_devices_list (void)
-{
- return gdk_display_list_devices (_gdk_display);
-}
-
-GList *
gdk_display_list_devices (GdkDisplay *dpy)
{
g_return_val_if_fail (dpy == _gdk_display, NULL);
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index bd41a42..aba194d 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -45,22 +45,6 @@ struct _GdkInputWindow
};
-/**
- * gdk_devices_list:
- *
- * Returns the list of available input devices for the default display.
- * The list is statically allocated and should not be freed.
- *
- * Return value: (transfer none) (element-type GdkDevice): a list of #GdkDevice
- *
- * Deprecated: 3.0: Use gdk_device_manager_list_devices() instead.
- **/
-GList *
-gdk_devices_list (void)
-{
- return gdk_display_list_devices (gdk_display_get_default ());
-}
-
static void
_gdk_input_select_device_events (GdkWindow *impl_window,
GdkDevice *device)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]