diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-09-02 19:02:54 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-09-02 19:59:41 -0400 |
| commit | 5053e9917ebed4a9f2fbd30f85e9136f1e79d978 (patch) | |
| tree | b87cae5abde6e65f3a54d22319b3cc7383f99b27 | |
| parent | 4f5d959a947d0a38b1b0fe5fbcc48b44f41e36d3 (diff) | |
| download | gtk+-5053e9917ebed4a9f2fbd30f85e9136f1e79d978.tar.gz | |
Fix build against pango main
Handle (and ignore) new Pango attributes.
| -rw-r--r-- | demos/gtk-demo/fontify.c | 6 | ||||
| -rw-r--r-- | gtk/gtkpango.c | 6 | ||||
| -rw-r--r-- | gtk/gtktextbuffer.c | 6 | ||||
| -rw-r--r-- | testsuite/gtk/label.c | 4 |
4 files changed, 22 insertions, 0 deletions
diff --git a/demos/gtk-demo/fontify.c b/demos/gtk-demo/fontify.c index 8eb3c148f4..a1c668552a 100644 --- a/demos/gtk-demo/fontify.c +++ b/demos/gtk-demo/fontify.c @@ -271,6 +271,12 @@ insert_tags_for_attributes (GtkTextBuffer *buffer, #if PANGO_VERSION_CHECK(1,49,0) case PANGO_ATTR_TEXT_TRANSFORM: +#endif +#if PANGO_VERSION_CHECK(1,49,1) + case PANGO_ATTR_WORD: + case PANGO_ATTR_SENTENCE: + case PANGO_ATTR_BASELINE_SHIFT: + case PANGO_ATTR_FONT_SCALE: break; #endif diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c index beb4a73ef0..067116c87e 100644 --- a/gtk/gtkpango.c +++ b/gtk/gtkpango.c @@ -263,6 +263,12 @@ attribute_from_text (GtkBuilder *builder, attribute = pango_attr_text_transform_new (g_value_get_enum (&val)); break; #endif +#if PANGO_VERSION_CHECK(1, 49, 1) + case PANGO_ATTR_WORD: + case PANGO_ATTR_SENTENCE: + case PANGO_ATTR_BASELINE_SHIFT: + case PANGO_ATTR_FONT_SCALE: +#endif case PANGO_ATTR_INVALID: default: break; diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 2101776e95..caafa36176 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -4713,6 +4713,12 @@ insert_tags_for_attributes (GtkTextBuffer *buffer, #if PANGO_VERSION_CHECK(1, 49, 0) case PANGO_ATTR_TEXT_TRANSFORM: +#endif +#if PANGO_VERSION_CHECK(1, 49, 1) + case PANGO_ATTR_WORD: + case PANGO_ATTR_SENTENCE: + case PANGO_ATTR_BASELINE_SHIFT: + case PANGO_ATTR_FONT_SCALE: break; #endif diff --git a/testsuite/gtk/label.c b/testsuite/gtk/label.c index e06623e00c..bb9987577c 100644 --- a/testsuite/gtk/label.c +++ b/testsuite/gtk/label.c @@ -44,6 +44,10 @@ print_attribute (PangoAttribute *attr, GString *string) #if PANGO_VERSION_CHECK(1, 49, 0) case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT: case PANGO_ATTR_TEXT_TRANSFORM: + case PANGO_ATTR_WORD: + case PANGO_ATTR_SENTENCE: + case PANGO_ATTR_BASELINE_SHIFT: + case PANGO_ATTR_FONT_SCALE: #endif g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value); break; |