83 lines
3.2 KiB
Diff
83 lines
3.2 KiB
Diff
From e0d9dd8ba96bfc86d71bf3cd2d56521f4be561a3 Mon Sep 17 00:00:00 2001
|
|
From: David King <amigadave@amigadave.com>
|
|
Date: Fri, 19 Jan 2024 10:41:33 +0000
|
|
Subject: [PATCH 1/2] tests: Fix GdkEventButton casts in testinput
|
|
|
|
---
|
|
tests/testinput.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tests/testinput.c b/tests/testinput.c
|
|
index b68552a428..3d4d7f6f87 100644
|
|
--- a/tests/testinput.c
|
|
+++ b/tests/testinput.c
|
|
@@ -194,7 +194,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event)
|
|
|
|
print_axes (event->device, event->axes);
|
|
gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure);
|
|
- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)),
|
|
+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)),
|
|
event->x, event->y, pressure);
|
|
|
|
motion_time = event->time;
|
|
@@ -239,10 +239,10 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
|
|
gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_X, &x);
|
|
gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_Y, &y);
|
|
gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_PRESSURE, &pressure);
|
|
- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)),
|
|
+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)),
|
|
x, y, pressure);
|
|
|
|
- print_axes (gdk_event_get_source_device (event), events[i]->axes);
|
|
+ print_axes (gdk_event_get_source_device ((GdkEvent *)event), events[i]->axes);
|
|
}
|
|
gdk_device_free_history (events, n_events);
|
|
}
|
|
@@ -252,7 +252,7 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
|
|
|
|
gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure);
|
|
|
|
- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)),
|
|
+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)),
|
|
event->x, event->y, pressure);
|
|
}
|
|
motion_time = event->time;
|
|
--
|
|
2.43.0
|
|
|
|
|
|
From 9a979bf5f040d44fbbdcac1195d660ef2b8a04fd Mon Sep 17 00:00:00 2001
|
|
From: David King <amigadave@amigadave.com>
|
|
Date: Fri, 19 Jan 2024 11:04:37 +0000
|
|
Subject: [PATCH 2/2] testsuite: Fix casts in reftests
|
|
|
|
---
|
|
testsuite/reftests/gtk-reftest.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c
|
|
index 1a51a9756b..b6a144ff0d 100644
|
|
--- a/testsuite/reftests/gtk-reftest.c
|
|
+++ b/testsuite/reftests/gtk-reftest.c
|
|
@@ -381,7 +381,7 @@ enforce_default_settings (void)
|
|
|
|
klass = g_type_class_ref (G_OBJECT_TYPE (settings));
|
|
|
|
- pspecs = g_object_class_list_properties (klass, &n_pspecs);
|
|
+ pspecs = g_object_class_list_properties ((GObjectClass *)klass, &n_pspecs);
|
|
for (i = 0; i < n_pspecs; i++)
|
|
{
|
|
GParamSpec *pspec = pspecs[i];
|
|
@@ -394,7 +394,7 @@ enforce_default_settings (void)
|
|
continue;
|
|
|
|
value = g_param_spec_get_default_value (pspec);
|
|
- g_object_set_property (settings, pspec->name, value);
|
|
+ g_object_set_property ((GObject *)settings, pspec->name, value);
|
|
}
|
|
|
|
g_free (pspecs);
|
|
--
|
|
2.43.0
|
|
|