From: Philipp Stephani <phst@google.com>
Date: Sun, 27 Aug 2017 11:11:55 +0000 (+0200)
Subject: Remove use of a deprecated GTK+ function in new versions
X-Git-Tag: emacs-26.0.90~336
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d309ce429912a39c4f19877f23cf36116b679818;p=emacs.git

Remove use of a deprecated GTK+ function in new versions

* src/gtkutil.c (xg_make_tool_item): Use gtk_widget_set_focus_on_click
if available
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 2675cd51586..7a110daef1e 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4617,7 +4617,11 @@ xg_make_tool_item (struct frame *f,
   if (wimage && text_image)
     gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0);
 
+#if GTK_CHECK_VERSION (3, 20, 0)
+  gtk_widget_set_focus_on_click (wb, FALSE);
+#else
   gtk_button_set_focus_on_click (GTK_BUTTON (wb), FALSE);
+#endif
   gtk_button_set_relief (GTK_BUTTON (wb), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER (wb), vb);
   gtk_container_add (GTK_CONTAINER (weventbox), wb);