diff options
| author | Robert Pluim | 2019-11-18 15:39:54 +0100 |
|---|---|---|
| committer | Robert Pluim | 2019-11-18 15:49:31 +0100 |
| commit | 899bd78c4fe81ee8e9de7677674396f2dea37510 (patch) | |
| tree | e6c3710461a3c6edbdd89c2c5a13a76543c5ea95 /src | |
| parent | 2e92f176a3ae68ed6fcf9f07c173c61a497f33fd (diff) | |
| download | emacs-899bd78c4fe81ee8e9de7677674396f2dea37510.tar.gz emacs-899bd78c4fe81ee8e9de7677674396f2dea37510.zip | |
Check for HAVE_GTK3 instead of a specific version
Our minimum GTK3 version is 3.10, the font filter functions appeared
in 3.2.
* gtkutil.c (xg_font_filter) [HAVE_GTK3]: Just check for HAVE_GTK3.
(xg_get_font) [HAVE_GTK3]: Same here.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtkutil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index c4d2ef9d80b..4bab4059c35 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -2228,7 +2228,7 @@ xg_get_file_name (struct frame *f, | |||
| 2228 | 2228 | ||
| 2229 | static char *x_last_font_name; | 2229 | static char *x_last_font_name; |
| 2230 | 2230 | ||
| 2231 | #if GTK_CHECK_VERSION (3, 2, 0) | 2231 | #if HAVE_GTK3 |
| 2232 | static gboolean | 2232 | static gboolean |
| 2233 | xg_font_filter (const PangoFontFamily *family, | 2233 | xg_font_filter (const PangoFontFamily *family, |
| 2234 | const PangoFontFace *face, | 2234 | const PangoFontFace *face, |
| @@ -2262,7 +2262,7 @@ xg_get_font (struct frame *f, const char *default_name) | |||
| 2262 | w = gtk_font_chooser_dialog_new | 2262 | w = gtk_font_chooser_dialog_new |
| 2263 | ("Pick a font", GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | 2263 | ("Pick a font", GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
| 2264 | 2264 | ||
| 2265 | #if GTK_CHECK_VERSION (3, 2, 0) | 2265 | #ifdef HAVE_GTK3 |
| 2266 | gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (w), xg_font_filter, NULL, NULL); | 2266 | gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (w), xg_font_filter, NULL, NULL); |
| 2267 | #endif | 2267 | #endif |
| 2268 | if (default_name) | 2268 | if (default_name) |