diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2011-04-08 16:23:39 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2011-04-08 16:39:45 +0200 |
commit | db74a6e81626730b91e49ae855270e616d7c6f5d (patch) | |
tree | 806f3d064343538c988e1b218b593ae4559b865d /gdk | |
parent | 955f01cdf7ae1be4f19d7091a855c628470bbcc6 (diff) | |
download | gtk+-db74a6e81626730b91e49ae855270e616d7c6f5d.tar.gz |
GdkDevice: Remove duplicate private function
_gdk_device_get_axis_use() dates back to pre-sealing, when the
xi2 work began, this remaining can be gone with a public
gdk_device_get_axis_use() function already in place.
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/gdkdevice.c | 10 | ||||
-rw-r--r-- | gdk/gdkdeviceprivate.h | 3 | ||||
-rw-r--r-- | gdk/win32/gdkdevice-wintab.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkdevice-xi.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkdevice-xi2.c | 2 | ||||
-rw-r--r-- | gdk/x11/gdkdevicemanager-xi2.c | 2 |
6 files changed, 4 insertions, 17 deletions
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 227c75c9d2..0d3c04054d 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -1400,16 +1400,6 @@ find_axis_info (GArray *array, return NULL; } -GdkAxisUse -_gdk_device_get_axis_use (GdkDevice *device, - guint index_) -{ - GdkAxisInfo info; - - info = g_array_index (device->axes, GdkAxisInfo, index_); - return info.use; -} - gboolean _gdk_device_translate_window_coord (GdkDevice *device, GdkWindow *window, diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h index 8816576b53..e317b16c1e 100644 --- a/gdk/gdkdeviceprivate.h +++ b/gdk/gdkdeviceprivate.h @@ -127,9 +127,6 @@ guint _gdk_device_add_axis (GdkDevice *device, void _gdk_device_set_keys (GdkDevice *device, guint num_keys); -GdkAxisUse _gdk_device_get_axis_use (GdkDevice *device, - guint index); - gboolean _gdk_device_translate_window_coord (GdkDevice *device, GdkWindow *window, guint index, diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c index 351105fe0c..def7945d25 100644 --- a/gdk/win32/gdkdevice-wintab.c +++ b/gdk/win32/gdkdevice-wintab.c @@ -326,7 +326,7 @@ _gdk_device_wintab_translate_axes (GdkDeviceWintab *device_wintab, { GdkAxisUse use; - use = _gdk_device_get_axis_use (device, i); + use = gdk_device_get_axis_use (device, i); switch (use) { diff --git a/gdk/x11/gdkdevice-xi.c b/gdk/x11/gdkdevice-xi.c index ae0f7270c8..16ef3bd116 100644 --- a/gdk/x11/gdkdevice-xi.c +++ b/gdk/x11/gdkdevice-xi.c @@ -613,7 +613,7 @@ _gdk_x11_device_xi_translate_axes (GdkDevice *device, { GdkAxisUse use; - use = _gdk_device_get_axis_use (device, i); + use = gdk_device_get_axis_use (device, i); switch (use) { diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index 96715df874..d56f8fa4b9 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -205,7 +205,7 @@ gdk_x11_device_xi2_get_state (GdkDevice *device, continue; value = ((XIValuatorClassInfo *) class_info)->value; - use = _gdk_device_get_axis_use (device, j); + use = gdk_device_get_axis_use (device, j); switch (use) { diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index 13fd401a80..8b0ceb4e42 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -823,7 +823,7 @@ translate_axes (GdkDevice *device, if (!XIMaskIsSet (valuators->mask, i)) continue; - use = _gdk_device_get_axis_use (device, i); + use = gdk_device_get_axis_use (device, i); val = *vals++; switch (use) |