diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2025-08-28 02:40:20 +0300 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2025-08-28 11:26:01 +0300 |
| commit | 2070d7faf66425c72677c02616a087d30a9aa863 (patch) | |
| tree | 3f27d2af734ec6d5b353457bfb4bd10ed3c1790b | |
| parent | 61c1980e25cc5ce48d7c3902db1e39f6b92473f9 (diff) | |
| download | sciteco-2070d7faf66425c72677c02616a087d30a9aa863.tar.gz | |
bumped minimum Gtk version to 3.24
* Gtk 3.24 has been introduced accidentally in 9e3746a4
due to GtkEventControllerScroll.
* It would be possible to still support v3.12 by partially
reversing 9e3746a4 and conditionally including teco_interface_scroll_cb().
But it's probably not worth the trouble.
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/interface-gtk/gtk-label.c | 2 | ||||
| -rw-r--r-- | src/interface-gtk/view.c | 4 |
5 files changed, 3 insertions, 9 deletions
@@ -34,7 +34,7 @@ SciTECO Build and Runtime Dependencies build from PDCurses Git instead. * other curses implementations might work as well but are untested * When choosing the GTK interface: - * GTK+ v3.12 or later: http://www.gtk.org/ + * GTK+ v3.24 or later: http://www.gtk.org/ * GNU roff (groff) v1.19.2 or later: https://www.gnu.org/software/groff/ Required at build-time, but it is already shipped on most UNIX-like systems to format man pages. diff --git a/configure.ac b/configure.ac index 9d5e059..8ad4685 100644 --- a/configure.ac +++ b/configure.ac @@ -371,7 +371,7 @@ case $INTERFACE in ;; gtk) - PKG_CHECK_MODULES(LIBGTK, [gtk+-3.0 >= 3.12], [ + PKG_CHECK_MODULES(LIBGTK, [gtk+-3.0 >= 3.24], [ CFLAGS="$CFLAGS $LIBGTK_CFLAGS" CXXFLAGS="$CXXFLAGS $LIBGTK_CFLAGS" LIBS="$LIBS $LIBGTK_LIBS" diff --git a/debian/control b/debian/control index 7cadc4f..c7035e4 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Robin Haberkorn <robin.haberkorn@googlemail.com> Build-Depends: debhelper (>= 10), dh-exec, gcc (>= 4:8.1), g++ (>= 4:8.1), libglib2.0-dev (>= 2.44), ncurses-term, libncurses-dev, - libgtk-3-dev (>= 3.12), xvfb, + libgtk-3-dev (>= 3.24), xvfb, groff (>= 1.19.2) Standards-Version: 4.5.0 Homepage: https://rhaberkorn.github.io/sciteco/ diff --git a/src/interface-gtk/gtk-label.c b/src/interface-gtk/gtk-label.c index 9fc9e76..e4b2823 100644 --- a/src/interface-gtk/gtk-label.c +++ b/src/interface-gtk/gtk-label.c @@ -143,7 +143,6 @@ teco_gtk_label_add_highlight_attribs(PangoAttrList *attribs, PangoColor *fg, gui * even in Pango v1.38. * Perhaps, this has been fixed in later versions. */ -#if PANGO_VERSION_CHECK(1,38,0) attr = pango_attr_foreground_alpha_new(fg_alpha); attr->start_index = index; attr->end_index = index + len; @@ -153,7 +152,6 @@ teco_gtk_label_add_highlight_attribs(PangoAttrList *attribs, PangoColor *fg, gui attr->start_index = index; attr->end_index = index + len; pango_attr_list_insert(attribs, attr); -#endif attr = pango_attr_foreground_new(fg->red, fg->green, fg->blue); attr->start_index = index; diff --git a/src/interface-gtk/view.c b/src/interface-gtk/view.c index 81db3d7..44e3988 100644 --- a/src/interface-gtk/view.c +++ b/src/interface-gtk/view.c @@ -102,12 +102,8 @@ teco_view_new(void) gint events = gtk_widget_get_events(GTK_WIDGET(ctx)); events &= ~(GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | -#ifdef GDK_VERSION_3_18 GDK_TOUCHPAD_GESTURE_MASK | -#endif -#ifdef GDK_VERSION_3_22 GDK_TABLET_PAD_MASK | -#endif GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); gtk_widget_set_events(GTK_WIDGET(ctx), events); |