aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPo Lu2022-04-13 11:13:28 +0800
committerPo Lu2022-04-13 11:15:05 +0800
commite91cbdfaee57052e0cbfecd08f77d95915ea532a (patch)
tree8444f9b394b43de688681174cceabdceeebf2c00
parent88a04ea985180d1fd619c4a6540fb117a1d59d9e (diff)
downloademacs-e91cbdfaee57052e0cbfecd08f77d95915ea532a.tar.gz
emacs-e91cbdfaee57052e0cbfecd08f77d95915ea532a.zip
Bump minimum GTK for PGTK builds
* configure.ac: Require GTK 3.20 or later if building with PGTK. It has already been required for some time now, but the requirement was not reflected in the configure script. * src/pgtkterm.c (pgtk_any_window_to_frame): Remove version check.
-rw-r--r--configure.ac6
-rw-r--r--src/pgtkterm.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 185e4d08623..1e66acf52fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2797,7 +2797,11 @@ gtk3_pkg_errors=
2797if test "${opsys}" != "mingw32"; then 2797if test "${opsys}" != "mingw32"; then
2798 if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then 2798 if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
2799 GLIB_REQUIRED=2.37.5 2799 GLIB_REQUIRED=2.37.5
2800 GTK_REQUIRED=3.10 2800 if test "${window_system}" = "x"; then
2801 GTK_REQUIRED=3.10
2802 else
2803 GTK_REQUIRED=3.20
2804 fi
2801 GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 2805 GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
2802 2806
2803 dnl Checks for libraries. 2807 dnl Checks for libraries.
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 566fc1f03d1..0bb41cb4463 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -5008,7 +5008,6 @@ pgtk_any_window_to_frame (GdkWindow * window)
5008static gboolean 5008static gboolean
5009pgtk_handle_event (GtkWidget *widget, GdkEvent *event, gpointer *data) 5009pgtk_handle_event (GtkWidget *widget, GdkEvent *event, gpointer *data)
5010{ 5010{
5011#if GTK_CHECK_VERSION (3, 18, 0)
5012 struct frame *f; 5011 struct frame *f;
5013 union buffered_input_event inev; 5012 union buffered_input_event inev;
5014 GtkWidget *frame_widget; 5013 GtkWidget *frame_widget;
@@ -5045,7 +5044,6 @@ pgtk_handle_event (GtkWidget *widget, GdkEvent *event, gpointer *data)
5045 5044
5046 return TRUE; 5045 return TRUE;
5047 } 5046 }
5048#endif
5049 return FALSE; 5047 return FALSE;
5050} 5048}
5051 5049