summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--demos/gtk-demo/fontify.c4
-rw-r--r--gtk/gtkcssstyle.c2
-rw-r--r--gtk/gtkpango.c2
-rw-r--r--gtk/gtktextbuffer.c4
-rw-r--r--gtk/gtktextlayout.c2
-rw-r--r--testsuite/gtk/label.c4
6 files changed, 0 insertions, 18 deletions
diff --git a/demos/gtk-demo/fontify.c b/demos/gtk-demo/fontify.c
index 2ceeab9416..de6a9ca699 100644
--- a/demos/gtk-demo/fontify.c
+++ b/demos/gtk-demo/fontify.c
@@ -255,14 +255,12 @@ insert_tags_for_attributes (GtkTextBuffer *buffer,
INT_ATTR (insert_hyphens);
break;
-#if PANGO_VERSION_CHECK(1,49,0)
case PANGO_ATTR_LINE_HEIGHT:
FLOAT_ATTR (line_height);
break;
case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
break;
-#endif
case PANGO_ATTR_SHAPE:
case PANGO_ATTR_ABSOLUTE_SIZE:
@@ -272,10 +270,8 @@ insert_tags_for_attributes (GtkTextBuffer *buffer,
case PANGO_ATTR_BACKGROUND_ALPHA:
break;
-#if PANGO_VERSION_CHECK(1,49,0)
case PANGO_ATTR_TEXT_TRANSFORM:
break;
-#endif
case PANGO_ATTR_INVALID:
default:
diff --git a/gtk/gtkcssstyle.c b/gtk/gtkcssstyle.c
index 01e7467a10..92a7398988 100644
--- a/gtk/gtkcssstyle.c
+++ b/gtk/gtkcssstyle.c
@@ -486,7 +486,6 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
attrs = add_pango_attr (attrs, pango_attr_letter_spacing_new (letter_spacing * PANGO_SCALE));
}
-#if PANGO_VERSION_CHECK(1, 49, 0)
/* line-height */
{
double height = gtk_css_line_height_value_get (style->font->line_height);
@@ -498,7 +497,6 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
attrs = add_pango_attr (attrs, pango_attr_line_height_new (height));
}
}
-#endif
/* OpenType features */
diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index beb4a73ef0..0fa65a3220 100644
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -249,7 +249,6 @@ attribute_from_text (GtkBuilder *builder,
color->blue * 65535);
}
break;
-#if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_LINE_HEIGHT:
if (gtk_builder_value_from_string_type (builder, G_TYPE_DOUBLE, value, &val, error))
attribute = pango_attr_line_height_new (g_value_get_double (&val));
@@ -262,7 +261,6 @@ attribute_from_text (GtkBuilder *builder,
if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_TEXT_TRANSFORM, value, &val, error))
attribute = pango_attr_text_transform_new (g_value_get_enum (&val));
break;
-#endif
case PANGO_ATTR_INVALID:
default:
break;
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index a611e48a91..38315286b4 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -4689,14 +4689,12 @@ insert_tags_for_attributes (GtkTextBuffer *buffer,
INT_ATTR (letter_spacing);
break;
-#if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_LINE_HEIGHT:
FLOAT_ATTR (line_height);
break;
case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
break;
-#endif
case PANGO_ATTR_FONT_FEATURES:
STRING_ATTR (font_features);
@@ -4714,10 +4712,8 @@ insert_tags_for_attributes (GtkTextBuffer *buffer,
INT_ATTR (insert_hyphens);
break;
-#if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_TEXT_TRANSFORM:
break;
-#endif
case PANGO_ATTR_SHAPE:
case PANGO_ATTR_ABSOLUTE_SIZE:
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index a0cd16697d..d6ad07ceaf 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1638,7 +1638,6 @@ add_text_attrs (GtkTextLayout *layout,
pango_attr_list_insert (attrs, attr);
}
-#if PANGO_VERSION_CHECK(1, 49, 0)
if (style->line_height != 0.0)
{
if (style->line_height_is_absolute)
@@ -1650,7 +1649,6 @@ add_text_attrs (GtkTextLayout *layout,
pango_attr_list_insert (attrs, attr);
}
-#endif
if (style->font_features)
{
diff --git a/testsuite/gtk/label.c b/testsuite/gtk/label.c
index e06623e00c..d03a03a6da 100644
--- a/testsuite/gtk/label.c
+++ b/testsuite/gtk/label.c
@@ -41,10 +41,8 @@ print_attribute (PangoAttribute *attr, GString *string)
case PANGO_ATTR_ALLOW_BREAKS:
case PANGO_ATTR_INSERT_HYPHENS:
case PANGO_ATTR_SHOW:
-#if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
case PANGO_ATTR_TEXT_TRANSFORM:
-#endif
g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value);
break;
case PANGO_ATTR_FONT_DESC:
@@ -69,9 +67,7 @@ print_attribute (PangoAttribute *attr, GString *string)
g_string_append_printf (string, "shape");
break;
case PANGO_ATTR_SCALE:
-#if PANGO_VERSION_CHECK(1, 49, 0)
case PANGO_ATTR_LINE_HEIGHT:
-#endif
{
char val[20];