[gtk+] GdkDevice: Remove duplicate private function
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GdkDevice: Remove duplicate private function
- Date: Fri, 8 Apr 2011 15:23:49 +0000 (UTC)
commit db74a6e81626730b91e49ae855270e616d7c6f5d
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Apr 8 16:23:39 2011 +0200
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.
gdk/gdkdevice.c | 10 ----------
gdk/gdkdeviceprivate.h | 3 ---
gdk/win32/gdkdevice-wintab.c | 2 +-
gdk/x11/gdkdevice-xi.c | 2 +-
gdk/x11/gdkdevice-xi2.c | 2 +-
gdk/x11/gdkdevicemanager-xi2.c | 2 +-
6 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 227c75c..0d3c040 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 8816576..e317b16 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 351105f..def7945 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 ae0f727..16ef3bd 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 96715df..d56f8fa 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 13fd401..8b0ceb4 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]