[gtk/pango-deprecation: 4/4] gtk: Stop using deprecated pango api
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/pango-deprecation: 4/4] gtk: Stop using deprecated pango api
- Date: Mon, 4 Feb 2019 23:30:30 +0000 (UTC)
commit 99c5a3d72cdce301003a7f89aa6d6e756bb39e75
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jan 31 14:07:08 2019 -0500
gtk: Stop using deprecated pango api
gtk/gtkentry.c | 2 +-
gtk/gtktextbtree.c | 5 +++--
gtk/gtktextview.c | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index f5231424e4..2115852aa3 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -5477,7 +5477,7 @@ gtk_entry_create_layout (GtkEntry *entry,
PangoDirection pango_dir;
if (gtk_entry_get_display_mode (entry) == DISPLAY_NORMAL)
- pango_dir = pango_find_base_dir (display_text, n_bytes);
+ pango_dir = gdk_find_base_dir (display_text, n_bytes);
else
pango_dir = PANGO_DIRECTION_NEUTRAL;
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index a51e96d8b1..a4f9b5398f 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -66,6 +66,8 @@
#include "gtkdebug.h"
#include "gtktextmarkprivate.h"
#include "gtktextsegment.h"
+#include "gtkpango.h"
+#include "gdk-private.h"
/*
* Types
@@ -595,8 +597,7 @@ gtk_text_btree_resolve_bidi (GtkTextIter *start,
{
PangoDirection pango_dir;
- pango_dir = pango_find_base_dir (seg->body.chars,
- seg->byte_count);
+ pango_dir = gdk_find_base_dir (seg->body.chars, seg->byte_count);
if (pango_dir != PANGO_DIRECTION_NEUTRAL)
{
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index bbdf7efb68..2950ad7dec 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -56,6 +56,7 @@
#include "gtktoolbar.h"
#include "gtkmagnifierprivate.h"
#include "gtkemojichooser.h"
+#include "gtkpango.h"
#include "a11y/gtktextviewaccessibleprivate.h"
@@ -5831,7 +5832,7 @@ iter_line_is_rtl (const GtkTextIter *iter)
gtk_text_iter_set_line_offset (&start, 0);
gtk_text_iter_forward_line (&end);
text = gtk_text_iter_get_visible_text (&start, &end);
- direction = pango_find_base_dir (text, -1);
+ direction = gdk_find_base_dir (text, -1);
g_free (text);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]