AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 21:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Drop pango version checks

Browse Source 
We are requiring pango 1.45.0 now, so no need to
Keep these ifdefs in the code any longer.
This commit is contained in:
Matthias Clasen 2020-06-06 21:32:55 -04:00
parent 15257e3922
commit b251893030
5 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcellrenderertext.c
View File

@ -1527,7 +1527,6 @@ get_layout (GtkCellRendererText *celltext,
uline = PANGO_UNDERLINE_DOUBLE;
break;
#if PANGO_VERSION_CHECK(1,45,0)
case PANGO_UNDERLINE_SINGLE_LINE:
uline = PANGO_UNDERLINE_DOUBLE_LINE;
break;
@ -1535,7 +1534,6 @@ get_layout (GtkCellRendererText *celltext,
case PANGO_UNDERLINE_DOUBLE_LINE:
case PANGO_UNDERLINE_ERROR_LINE:
break;
#endif
case PANGO_UNDERLINE_DOUBLE:
case PANGO_UNDERLINE_LOW:

4
gtk/gtkpango.c
View File

@ -1241,7 +1241,6 @@ attribute_from_text (GtkBuilder *builder,
if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
attribute = pango_attr_background_alpha_new ((guint16)g_value_get_int (&val));
break;
#if PANGO_VERSION_CHECK(1,44,0)
case PANGO_ATTR_ALLOW_BREAKS:
if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
attribute = pango_attr_allow_breaks_new (g_value_get_boolean (&val));
@ -1254,8 +1253,6 @@ attribute_from_text (GtkBuilder *builder,
if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
attribute = pango_attr_insert_hyphens_new (g_value_get_boolean (&val));
break;
#endif
#if PANGO_VERSION_CHECK(1,45,0)
case PANGO_ATTR_OVERLINE:
if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_OVERLINE, value, &val, NULL))
attribute = pango_attr_overline_new (g_value_get_enum (&val));
@ -1269,7 +1266,6 @@ attribute_from_text (GtkBuilder *builder,
color->blue * 65535);
}
break;
#endif
case PANGO_ATTR_INVALID:
default:
break;

2
gtk/gtktextbuffer.c
View File

@ -4772,7 +4772,6 @@ get_tag_for_attributes (PangoAttrIterator *iter)
g_object_set (tag, "underline-rgba", &rgba, NULL);
}
#if PANGO_VERSION_CHECK(1,45,0)
attr = pango_attr_iterator_get (iter, PANGO_ATTR_OVERLINE);
if (attr)
g_object_set (tag, "overline", ((PangoAttrInt*)attr)->value, NULL);
@ -4790,7 +4789,6 @@ get_tag_for_attributes (PangoAttrIterator *iter)
rgba.alpha = 1.;
g_object_set (tag, "overline-rgba", &rgba, NULL);
}
#endif
attr = pango_attr_iterator_get (iter, PANGO_ATTR_STRIKETHROUGH);
if (attr)

4
gtk/gtktextlayout.c
View File

@ -1597,7 +1597,6 @@ add_generic_attrs (GtkTextLayout *layout,
pango_attr_list_insert (attrs, attr);
}
#if PANGO_VERSION_CHECK(1,45,0)
if (appearance->overline != PANGO_OVERLINE_NONE)
{
attr = pango_attr_overline_new (appearance->overline);
@ -1619,7 +1618,6 @@ add_generic_attrs (GtkTextLayout *layout,
pango_attr_list_insert (attrs, attr);
}
#endif
if (appearance->strikethrough)
{
@ -2140,7 +2138,6 @@ add_preedit_attrs (GtkTextLayout *layout,
gdk_rgba_free (appearance.underline_rgba);
appearance.underline_rgba = gdk_rgba_copy (&rgba);
break;
#if PANGO_VERSION_CHECK(1,45,0)
case PANGO_ATTR_OVERLINE:
appearance.overline = ((PangoAttrInt *)attr)->value;
break;
@ -2150,7 +2147,6 @@ add_preedit_attrs (GtkTextLayout *layout,
gdk_rgba_free (appearance.overline_rgba);
appearance.overline_rgba = gdk_rgba_copy (&rgba);
break;
#endif
case PANGO_ATTR_STRIKETHROUGH:
appearance.strikethrough = ((PangoAttrInt *)attr)->value;
break;

18
gtk/gtktexttag.c
View File

@ -117,10 +117,8 @@ enum {
PROP_RIGHT_MARGIN,
PROP_UNDERLINE,
PROP_UNDERLINE_RGBA,
#if PANGO_VERSION_CHECK(1,45,0)
PROP_OVERLINE,
PROP_OVERLINE_RGBA,
#endif
PROP_RISE,
PROP_BACKGROUND_FULL_HEIGHT,
PROP_LANGUAGE,
@ -161,10 +159,8 @@ enum {
PROP_RIGHT_MARGIN_SET,
PROP_UNDERLINE_SET,
PROP_UNDERLINE_RGBA_SET,
#if PANGO_VERSION_CHECK(1,45,0)
PROP_OVERLINE_SET,
PROP_OVERLINE_RGBA_SET,
#endif
PROP_RISE_SET,
PROP_BACKGROUND_FULL_HEIGHT_SET,
PROP_LANGUAGE_SET,
@ -514,7 +510,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
GDK_TYPE_RGBA,
GTK_PARAM_READWRITE));
#if PANGO_VERSION_CHECK(1,45,0)
g_object_class_install_property (object_class,
PROP_OVERLINE,
g_param_spec_enum ("overline",
@ -531,7 +526,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
P_("Color of overline for this text"),
GDK_TYPE_RGBA,
GTK_PARAM_READWRITE));
#endif
/**
* GtkTextTag:strikethrough-rgba:
@ -793,7 +787,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
P_("Underline RGBA set"),
P_("Whether this tag affects underlining color"));
#if PANGO_VERSION_CHECK(1,45,0)
ADD_SET_PROP ("overline-set", PROP_OVERLINE_SET,
P_("Overline set"),
P_("Whether this tag affects overlining"));
@ -801,7 +794,6 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
ADD_SET_PROP ("overline-rgba-set", PROP_OVERLINE_RGBA_SET,
P_("Overline RGBA set"),
P_("Whether this tag affects overlining color"));
#endif
/**
* GtkTextTag:strikethrough-rgba-set:
@ -929,7 +921,6 @@ set_underline_rgba (GtkTextTag *tag,
}
}
#if PANGO_VERSION_CHECK(1,45,0)
static void
set_overline_rgba (GtkTextTag *tag,
const GdkRGBA *rgba)
@ -959,7 +950,6 @@ set_overline_rgba (GtkTextTag *tag,
}
}
}
#endif
static void
set_strikethrough_rgba (GtkTextTag *tag,
@ -1485,7 +1475,6 @@ gtk_text_tag_set_property (GObject *object,
}
break;
#if PANGO_VERSION_CHECK(1,45,0)
case PROP_OVERLINE:
priv->overline_set = TRUE;
priv->values->appearance.overline = g_value_get_enum (value);
@ -1498,7 +1487,6 @@ gtk_text_tag_set_property (GObject *object,
set_overline_rgba (text_tag, color);
}
break;
#endif
case PROP_RISE:
priv->rise_set = TRUE;
@ -1702,7 +1690,6 @@ gtk_text_tag_set_property (GObject *object,
priv->underline_rgba_set = g_value_get_boolean (value);
break;
#if PANGO_VERSION_CHECK(1,45,0)
case PROP_OVERLINE_SET:
priv->overline_set = g_value_get_boolean (value);
break;
@ -1710,7 +1697,6 @@ gtk_text_tag_set_property (GObject *object,
case PROP_OVERLINE_RGBA_SET:
priv->overline_rgba_set = g_value_get_boolean (value);
break;
#endif
case PROP_RISE_SET:
priv->rise_set = g_value_get_boolean (value);
@ -1913,7 +1899,6 @@ gtk_text_tag_get_property (GObject *object,
g_value_set_boxed (value, priv->values->appearance.underline_rgba);
break;
#if PANGO_VERSION_CHECK(1,45,0)
case PROP_OVERLINE:
g_value_set_enum (value, priv->values->appearance.overline);
break;
@ -1922,7 +1907,6 @@ gtk_text_tag_get_property (GObject *object,
if (priv->overline_rgba_set)
g_value_set_boxed (value, priv->values->appearance.overline_rgba);
break;
#endif
case PROP_RISE:
g_value_set_int (value, priv->values->appearance.rise);
@ -2056,7 +2040,6 @@ gtk_text_tag_get_property (GObject *object,
g_value_set_boolean (value, priv->underline_rgba_set);
break;
#if PANGO_VERSION_CHECK(1,45,0)
case PROP_OVERLINE_SET:
g_value_set_boolean (value, priv->overline_set);
break;
@ -2064,7 +2047,6 @@ gtk_text_tag_get_property (GObject *object,
case PROP_OVERLINE_RGBA_SET:
g_value_set_boolean (value, priv->overline_rgba_set);
break;
#endif
case PROP_RISE_SET:
g_value_set_boolean (value, priv->rise_set);