Commit 5e53c047 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Merge branch 'latest.glib.msvc' into 'master'

Fix builds against latest stable GLib with MSVC

See merge request !3443
parents 9d1e5aa0 153019a7
Pipeline #275177 passed with stages
in 33 minutes and 28 seconds
......@@ -554,19 +554,19 @@ gdk_clipboard_store_async (GdkClipboard *clipboard,
if (priv->local)
{
return GDK_CLIPBOARD_GET_CLASS (clipboard)->store_async (clipboard,
io_priority,
cancellable,
callback,
user_data);
GDK_CLIPBOARD_GET_CLASS (clipboard)->store_async (clipboard,
io_priority,
cancellable,
callback,
user_data);
}
else
{
return gdk_clipboard_store_default_async (clipboard,
io_priority,
cancellable,
callback,
user_data);
gdk_clipboard_store_default_async (clipboard,
io_priority,
cancellable,
callback,
user_data);
}
}
......
......@@ -377,7 +377,7 @@ gdk_content_provider_attach_clipboard (GdkContentProvider *provider,
g_return_if_fail (GDK_IS_CONTENT_PROVIDER (provider));
g_return_if_fail (GDK_IS_CLIPBOARD (clipboard));
return GDK_CONTENT_PROVIDER_GET_CLASS (provider)->attach_clipboard (provider, clipboard);
GDK_CONTENT_PROVIDER_GET_CLASS (provider)->attach_clipboard (provider, clipboard);
}
void
......@@ -387,5 +387,5 @@ gdk_content_provider_detach_clipboard (GdkContentProvider *provider,
g_return_if_fail (GDK_IS_CONTENT_PROVIDER (provider));
g_return_if_fail (GDK_IS_CLIPBOARD (clipboard));
return GDK_CONTENT_PROVIDER_GET_CLASS (provider)->detach_clipboard (provider, clipboard);
GDK_CONTENT_PROVIDER_GET_CLASS (provider)->detach_clipboard (provider, clipboard);
}
......@@ -446,7 +446,7 @@ gdk_texture_download_area (GdkTexture *texture,
g_assert (area->x + area->width <= texture->width);
g_assert (area->y + area->height <= texture->height);
return GDK_TEXTURE_GET_CLASS (texture)->download (texture, area, data, stride);
GDK_TEXTURE_GET_CLASS (texture)->download (texture, area, data, stride);
}
/**
......
......@@ -364,7 +364,7 @@ gdk_toplevel_focus (GdkToplevel *toplevel,
{
g_return_if_fail (GDK_IS_TOPLEVEL (toplevel));
return GDK_TOPLEVEL_GET_IFACE (toplevel)->focus (toplevel, timestamp);
GDK_TOPLEVEL_GET_IFACE (toplevel)->focus (toplevel, timestamp);
}
/**
......
......@@ -549,14 +549,14 @@ gsk_render_node_diff (GskRenderNode *node1,
return;
if (_gsk_render_node_get_node_type (node1) == _gsk_render_node_get_node_type (node2))
return GSK_RENDER_NODE_GET_CLASS (node1)->diff (node1, node2, region);
GSK_RENDER_NODE_GET_CLASS (node1)->diff (node1, node2, region);
if (_gsk_render_node_get_node_type (node1) == GSK_CONTAINER_NODE)
return gsk_container_node_diff_with (node1, node2, region);
if (_gsk_render_node_get_node_type (node2) == GSK_CONTAINER_NODE)
return gsk_container_node_diff_with (node2, node1, region);
return gsk_render_node_diff_impossible (node1, node2, region);
else if (_gsk_render_node_get_node_type (node1) == GSK_CONTAINER_NODE)
gsk_container_node_diff_with (node1, node2, region);
else if (_gsk_render_node_get_node_type (node2) == GSK_CONTAINER_NODE)
gsk_container_node_diff_with (node2, node1, region);
else
gsk_render_node_diff_impossible (node1, node2, region);
}
/**
......
......@@ -66,9 +66,9 @@ gtk_css_image_paintable_snapshot (GtkCssImage *image,
{
GtkCssImagePaintable *paintable = GTK_CSS_IMAGE_PAINTABLE (image);
return gdk_paintable_snapshot (get_paintable (paintable),
snapshot,
width, height);
gdk_paintable_snapshot (get_paintable (paintable),
snapshot,
width, height);
}
static GtkCssImage *
......
......@@ -102,7 +102,7 @@ gtk_native_layout (GtkNative *self,
int width,
int height)
{
return GTK_NATIVE_GET_IFACE (self)->layout (self, width, height);
GTK_NATIVE_GET_IFACE (self)->layout (self, width, height);
}
static void
......@@ -258,7 +258,7 @@ gtk_native_get_surface_transform (GtkNative *self,
g_return_if_fail (x != 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,
g_return_if_fail (GTK_IS_SHORTCUT_ACTION (self));
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