[gtk+] gdk: change signature of gdk_device_get_history() back to what it used to be
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: change signature of gdk_device_get_history() back to what it used to be
- Date: Tue, 19 Oct 2010 11:31:33 +0000 (UTC)
commit a1134e56224e881c3bf99c38e7f9681e18c85acc
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 19 13:30:42 2010 +0200
gdk: change signature of gdk_device_get_history() back to what it used to be
"n_events" went back from guint to gint.
gdk/gdkdevice.c | 4 ++--
gdk/gdkdevice.h | 2 +-
gdk/gdkdeviceprivate.h | 4 ++--
gdk/quartz/gdkdevice-core.c | 4 ++--
gdk/win32/gdkdevice-win32.c | 4 ++--
gdk/win32/gdkdevice-wintab.c | 4 ++--
gdk/x11/gdkdevice-core.c | 4 ++--
gdk/x11/gdkdevice-xi.c | 6 +++---
8 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index aaf4989..593e265 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -407,7 +407,7 @@ gdk_device_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events)
+ gint *n_events)
{
g_return_val_if_fail (GDK_IS_DEVICE (device), FALSE);
g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
@@ -431,7 +431,7 @@ gdk_device_get_history (GdkDevice *device,
GdkTimeCoord **
_gdk_device_allocate_history (GdkDevice *device,
- guint n_events)
+ gint n_events)
{
GdkTimeCoord **result = g_new (GdkTimeCoord *, n_events);
gint i;
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index b2a5db8..d4917f3 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -249,7 +249,7 @@ gboolean gdk_device_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events);
+ gint *n_events);
void gdk_device_free_history (GdkTimeCoord **events,
gint n_events);
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index 8a804e0..d878ae6 100644
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -40,7 +40,7 @@ struct _GdkDeviceClass
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events);
+ gint *n_events);
void (* get_state) (GdkDevice *device,
GdkWindow *window,
@@ -121,7 +121,7 @@ gboolean _gdk_device_translate_axis (GdkDevice *device,
gdouble *axis_value);
GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device,
- guint n_events);
+ gint n_events);
void _gdk_input_check_extension_events (GdkDevice *device);
diff --git a/gdk/quartz/gdkdevice-core.c b/gdk/quartz/gdkdevice-core.c
index 6397cf4..57dc3de 100644
--- a/gdk/quartz/gdkdevice-core.c
+++ b/gdk/quartz/gdkdevice-core.c
@@ -30,7 +30,7 @@ static gboolean gdk_device_core_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events);
+ gint *n_events);
static void gdk_device_core_get_state (GdkDevice *device,
GdkWindow *window,
gdouble *axes,
@@ -105,7 +105,7 @@ gdk_device_core_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events)
+ gint *n_events)
{
return FALSE;
}
diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c
index 31c6f5e..af461c7 100644
--- a/gdk/win32/gdkdevice-win32.c
+++ b/gdk/win32/gdkdevice-win32.c
@@ -32,7 +32,7 @@ static gboolean gdk_device_win32_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events);
+ gint *n_events);
static void gdk_device_win32_get_state (GdkDevice *device,
GdkWindow *window,
gdouble *axes,
@@ -107,7 +107,7 @@ gdk_device_win32_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events)
+ gint *n_events)
{
return FALSE;
}
diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c
index 392e10b..c88bacb 100644
--- a/gdk/win32/gdkdevice-wintab.c
+++ b/gdk/win32/gdkdevice-wintab.c
@@ -42,7 +42,7 @@ static gboolean gdk_device_wintab_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events);
+ gint *n_events);
static void gdk_device_wintab_get_state (GdkDevice *device,
GdkWindow *window,
gdouble *axes,
@@ -116,7 +116,7 @@ gdk_device_wintab_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events)
+ gint *n_events)
{
return FALSE;
}
diff --git a/gdk/x11/gdkdevice-core.c b/gdk/x11/gdkdevice-core.c
index 250ed3b..1620bde 100644
--- a/gdk/x11/gdkdevice-core.c
+++ b/gdk/x11/gdkdevice-core.c
@@ -30,7 +30,7 @@ static gboolean gdk_device_core_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events);
+ gint *n_events);
static void gdk_device_core_get_state (GdkDevice *device,
GdkWindow *window,
gdouble *axes,
@@ -123,7 +123,7 @@ gdk_device_core_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events)
+ gint *n_events)
{
GdkWindowObject *priv;
XTimeCoord *xcoords;
diff --git a/gdk/x11/gdkdevice-xi.c b/gdk/x11/gdkdevice-xi.c
index 7b4f39e..a1e850e 100644
--- a/gdk/x11/gdkdevice-xi.c
+++ b/gdk/x11/gdkdevice-xi.c
@@ -54,7 +54,7 @@ static gboolean gdk_device_xi_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events);
+ gint *n_events);
static void gdk_device_xi_get_state (GdkDevice *device,
GdkWindow *window,
@@ -229,7 +229,7 @@ gdk_device_xi_get_history (GdkDevice *device,
guint32 start,
guint32 stop,
GdkTimeCoord ***events,
- guint *n_events)
+ gint *n_events)
{
GdkTimeCoord **coords;
XDeviceTimeCoord *device_coords;
@@ -253,7 +253,7 @@ gdk_device_xi_get_history (GdkDevice *device,
if (!device_coords)
return FALSE;
- *n_events = (guint) n_events_return;
+ *n_events = n_events_return;
coords = _gdk_device_allocate_history (device, *n_events);
for (i = 0; i < *n_events; i++)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
