Commit 153019a7 authored by Chun-wei Fan's avatar Chun-wei Fan
Browse files

GTK: Fix builds against latest stable GLib with MSVC

GLib-2.68.x now considers warning C4098 ('void' function returning a value) as
an error, so avoid doing that.
parent 8df32e93
Pipeline #275098 passed with stages
in 21 minutes and 41 seconds
...@@ -66,9 +66,9 @@ gtk_css_image_paintable_snapshot (GtkCssImage *image, ...@@ -66,9 +66,9 @@ gtk_css_image_paintable_snapshot (GtkCssImage *image,
{ {
GtkCssImagePaintable *paintable = GTK_CSS_IMAGE_PAINTABLE (image); GtkCssImagePaintable *paintable = GTK_CSS_IMAGE_PAINTABLE (image);
return gdk_paintable_snapshot (get_paintable (paintable), gdk_paintable_snapshot (get_paintable (paintable),
snapshot, snapshot,
width, height); width, height);
} }
static GtkCssImage * static GtkCssImage *
......
...@@ -102,7 +102,7 @@ gtk_native_layout (GtkNative *self, ...@@ -102,7 +102,7 @@ gtk_native_layout (GtkNative *self,
int width, int width,
int height) int height)
{ {
return GTK_NATIVE_GET_IFACE (self)->layout (self, width, height); GTK_NATIVE_GET_IFACE (self)->layout (self, width, height);
} }
static void static void
...@@ -258,7 +258,7 @@ gtk_native_get_surface_transform (GtkNative *self, ...@@ -258,7 +258,7 @@ gtk_native_get_surface_transform (GtkNative *self,
g_return_if_fail (x != NULL); g_return_if_fail (x != NULL);
g_return_if_fail (y != NULL); g_return_if_fail (y != NULL);
return GTK_NATIVE_GET_IFACE (self)->get_surface_transform (self, x, y); GTK_NATIVE_GET_IFACE (self)->get_surface_transform (self, x, y);
} }
/** /**
......
...@@ -132,7 +132,7 @@ gtk_shortcut_action_print (GtkShortcutAction *self, ...@@ -132,7 +132,7 @@ gtk_shortcut_action_print (GtkShortcutAction *self,
g_return_if_fail (GTK_IS_SHORTCUT_ACTION (self)); g_return_if_fail (GTK_IS_SHORTCUT_ACTION (self));
g_return_if_fail (string != NULL); g_return_if_fail (string != NULL);
return GTK_SHORTCUT_ACTION_GET_CLASS (self)->print (self, string); GTK_SHORTCUT_ACTION_GET_CLASS (self)->print (self, string);
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment