callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkcsscustomgadget.c: Fix build with latest stable GLib with MSVC

Browse Source 
This eliminates the C4098 warnings ('void' function returning a value),
which is considered by GLib-2.68.x or later to be an error.
This commit is contained in:
Chun-wei Fan 2021-04-16 15:28:28 +08:00
parent 416e6b9cdd
commit 35fee660ff
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkcsscustomgadget.c
View File

@ -121,14 +121,14 @@ gtk_css_custom_gadget_get_preferred_size (GtkCssGadget *gadget,
GtkCssCustomGadgetPrivate *priv = gtk_css_custom_gadget_get_instance_private (GTK_CSS_CUSTOM_GADGET (gadget)); GtkCssCustomGadgetPrivate *priv = gtk_css_custom_gadget_get_instance_private (GTK_CSS_CUSTOM_GADGET (gadget));
if (priv->preferred_size_func) if (priv->preferred_size_func)
return priv->preferred_size_func (gadget, orientation, for_size, priv->preferred_size_func (gadget, orientation, for_size,
minimum, natural, minimum, natural,
minimum_baseline, natural_baseline, minimum_baseline, natural_baseline,
priv->data); priv->data);
else else
return GTK_CSS_GADGET_CLASS (gtk_css_custom_gadget_parent_class)->get_preferred_size (gadget, orientation, for_size, GTK_CSS_GADGET_CLASS (gtk_css_custom_gadget_parent_class)->get_preferred_size (gadget, orientation, for_size,
minimum, natural, minimum, natural,
minimum_baseline, natural_baseline); minimum_baseline, natural_baseline);
} }
static void static void
@ -140,9 +140,9 @@ gtk_css_custom_gadget_allocate (GtkCssGadget *gadget,
GtkCssCustomGadgetPrivate *priv = gtk_css_custom_gadget_get_instance_private (GTK_CSS_CUSTOM_GADGET (gadget)); GtkCssCustomGadgetPrivate *priv = gtk_css_custom_gadget_get_instance_private (GTK_CSS_CUSTOM_GADGET (gadget));
if (priv->allocate_func) if (priv->allocate_func)
return priv->allocate_func (gadget, allocation, baseline, out_clip, priv->data); priv->allocate_func (gadget, allocation, baseline, out_clip, priv->data);
else else
return GTK_CSS_GADGET_CLASS (gtk_css_custom_gadget_parent_class)->allocate (gadget, allocation, baseline, out_clip); GTK_CSS_GADGET_CLASS (gtk_css_custom_gadget_parent_class)->allocate (gadget, allocation, baseline, out_clip);
} }
static gboolean static gboolean