Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Increase minimum required gtkmm to 3.18.0 (!117) 

As discussed in the previous commit the oldest supported distributions
now provide gtkmm versions higher that 3.18.0 (which requires C++11
compilation).  Therefore increase the minimum required version to gtkmm
3.18.0.  This allows removal of HAVE_LABEL_SET_XALIGN autoconf
definition and associated fallback code.

Closes !117 - Require C++11 compilation
This commit is contained in:
Mike Fleetwood 2023-08-31 09:50:33 +01:00 committed by Curtis Gedak
parent 9f473b70cb
commit 6bf7668f8e
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -200,7 +200,7 @@ AC_SUBST([GTHREAD_LIBS])
AC_SUBST([GTHREAD_CFLAGS]) AC_SUBST([GTHREAD_CFLAGS])
dnl GTKMM dnl GTKMM
PKG_CHECK_MODULES([GTKMM], [gtkmm-3.0 >= 3.4.0]) PKG_CHECK_MODULES([GTKMM], [gtkmm-3.0 >= 3.18.0])
AC_SUBST([GTKMM_LIBS]) AC_SUBST([GTKMM_LIBS])
AC_SUBST([GTKMM_CFLAGS]) AC_SUBST([GTKMM_CFLAGS])
@ -213,18 +213,6 @@ dnl Require C++11 compilation.
AX_CXX_COMPILE_STDCXX_11() AX_CXX_COMPILE_STDCXX_11()
dnl Check for gtkmm >= 3.16 to determine availability of Gtk::Label::set_xalign().
AC_MSG_CHECKING([for Gtk::Label::set_xalign() method])
PKG_CHECK_EXISTS(
[gtkmm-3.0 >= 3.16.0],
[AC_DEFINE([HAVE_LABEL_SET_XALIGN], 1,
[Define to 1 if gtkmm provides Gtk::Label::set_xalign() method.])
AC_MSG_RESULT([yes])
],
[AC_MSG_RESULT([no])]
)
dnl Check for gtkmm >= 3.22 to determine availability of Gtk::ScrolledWindow::set_propagate_natural_width(). dnl Check for gtkmm >= 3.22 to determine availability of Gtk::ScrolledWindow::set_propagate_natural_width().
AC_MSG_CHECKING([for Gtk::ScrolledWindow::set_propagate_natural_width() method]) AC_MSG_CHECKING([for Gtk::ScrolledWindow::set_propagate_natural_width() method])
PKG_CHECK_EXISTS( PKG_CHECK_EXISTS(

4
src/Utils.cc
View File

@ -68,11 +68,7 @@ Gtk::Label * Utils::mk_label( const Glib::ustring & text
{ {
Gtk::Label *label = manage(new Gtk::Label(text)); Gtk::Label *label = manage(new Gtk::Label(text));
#if HAVE_LABEL_SET_XALIGN
label->set_xalign(0.0); label->set_xalign(0.0);
#else
label->set_alignment(0.0, 0.5);
#endif
label->set_valign(valign); label->set_valign(valign);
label ->set_use_markup( use_markup ) ; label ->set_use_markup( use_markup ) ;
if (wrap) if (wrap)