aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilipp Stephani2017-08-25 11:08:25 +0200
committerPhilipp Stephani2017-08-27 13:27:02 +0200
commita1faaf3092cf47a274c1f9b93c312bf917a50b92 (patch)
tree08f781d96a6e4ea9e1cc6d5961bff602927ae397 /src
parenta2c967e28ba53d282764bdcc624e64b6c3b7bb06 (diff)
downloademacs-a1faaf3092cf47a274c1f9b93c312bf917a50b92.tar.gz
emacs-a1faaf3092cf47a274c1f9b93c312bf917a50b92.zip
Remove call of deprecated GDK function
* src/xterm.h (XSync): Don’t call gdk_window_process_all_updates in GDK 3.22 or later.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/xterm.h b/src/xterm.h
index 803feda99f3..8521cb4c9f3 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -49,13 +49,6 @@ typedef Widget xt_or_gtk_widget;
49#include <gtk/gtk.h> 49#include <gtk/gtk.h>
50#include <gdk/gdkx.h> 50#include <gdk/gdkx.h>
51 51
52/* Some definitions to reduce conditionals. */
53typedef GtkWidget *xt_or_gtk_widget;
54#undef XSync
55#define XSync(d, b) do { gdk_window_process_all_updates (); \
56 XSync (d, b); } while (false)
57#endif /* USE_GTK */
58
59/* True iff GTK's version is at least I.J.K. */ 52/* True iff GTK's version is at least I.J.K. */
60#ifndef GTK_CHECK_VERSION 53#ifndef GTK_CHECK_VERSION
61# ifdef USE_GTK 54# ifdef USE_GTK
@@ -69,6 +62,18 @@ typedef GtkWidget *xt_or_gtk_widget;
69# endif 62# endif
70#endif 63#endif
71 64
65/* Some definitions to reduce conditionals. */
66typedef GtkWidget *xt_or_gtk_widget;
67#undef XSync
68/* gdk_window_process_all_updates is deprecated in GDK 3.22. */
69#if GTK_CHECK_VERSION (3, 22, 0)
70#define XSync(d, b) do { XSync ((d), (b)); } while (false)
71#else
72#define XSync(d, b) do { gdk_window_process_all_updates (); \
73 XSync (d, b); } while (false)
74#endif
75#endif /* USE_GTK */
76
72/* The GtkTooltip API came in 2.12, but gtk-enable-tooltips in 2.14. */ 77/* The GtkTooltip API came in 2.12, but gtk-enable-tooltips in 2.14. */
73#if GTK_CHECK_VERSION (2, 14, 0) 78#if GTK_CHECK_VERSION (2, 14, 0)
74#define USE_GTK_TOOLTIP 79#define USE_GTK_TOOLTIP