[gparted] modern-gtk2: Always use Gtk::MessageDialog::get_message_area() (!17)



commit c0aa3dbfdf3e749ebf26096d32a50710f64530bf
Author: Luca Bacci <luca bacci982 gmail com>
Date:   Mon Aug 27 19:56:28 2018 +0200

    modern-gtk2: Always use Gtk::MessageDialog::get_message_area() (!17)
    
    Remove check for Gtk::Messagedialog::get_message_area() and associated
    fallback code as it is always available from gtkmm 2.22.
    
    Reference:
    https://gitlab.gnome.org/GNOME/gtkmm/blob/2.22.0/NEWS#L25
    
    Closes !17 - Gtk2 modernisation

 configure.ac       | 12 ------------
 src/Win_GParted.cc | 30 ++----------------------------
 2 files changed, 2 insertions(+), 40 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 501fdd07..89c672eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,18 +228,6 @@ dnl Check for glibmm minimum required version.
 PKG_CHECK_MODULES([GLIBMM], [glibmm-2.4 >= 2.14.0])
 
 
-dnl Check for gtkmm >= 2.22 to determine availability of Gtk::MessageDialog::get_message_area().
-AC_MSG_CHECKING([for Gtk::MessageDialog::get_message_area() method])
-PKG_CHECK_EXISTS(
-       [gtkmm-2.4 >= 2.22.0],
-       [AC_DEFINE([HAVE_GET_MESSAGE_AREA], 1,
-                  [Define to 1 if gtkmm provides Gtk::MessageDialog::get_message_area() method.])
-        AC_MSG_RESULT([yes])
-       ],
-       [AC_MSG_RESULT([no])]
-)
-
-
 need_cxx_compile_stdcxx_11=no
 dnl Check for glibmm >= 2.45.40 which requires C++11 compilation.
 AC_MSG_CHECKING([for glibmm >= 2.45.40 which requires C++11 compilation])
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 8c1efea1..9cee9e0d 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -3361,35 +3361,10 @@ bool Win_GParted::remove_non_empty_lvm2_pv_dialog( const OperationType optype )
        const Glib::ustring vgname_label  = _( "Volume Group:" ) ;
        const Glib::ustring members_label = _( "Members:" ) ;
 
-#ifndef HAVE_GET_MESSAGE_AREA
-       //Basic method of displaying VG members by appending it to the secondary text in the dialog.
-       tmp_msg += "\n____________________\n\n" ;
-       tmp_msg += "<b>" ;
-       tmp_msg +=       vgname_label ;
-       tmp_msg +=                    "</b>    " ;
-       tmp_msg +=                               vgname ;
-       tmp_msg += "\n" ;
-       tmp_msg += "<b>" ;
-       tmp_msg +=       members_label ;
-       tmp_msg +=                     "</b>" ;
-       if ( ! members .empty() )
-       {
-               tmp_msg += "    " ;
-               tmp_msg +=        members [0] ;
-               for ( unsigned int i = 1 ; i < members .size() ; i ++ )
-               {
-                       tmp_msg += "    " ;
-                       tmp_msg +=        members [i] ;
-               }
-       }
-#endif /* ! HAVE_GET_MESSAGE_AREA */
-
        dialog .set_secondary_text( tmp_msg, true ) ;
 
-#ifdef HAVE_GET_MESSAGE_AREA
-       //Nicely formatted method of displaying VG members by using a table below the secondary text
-       //  in the dialog.  Uses Gtk::MessageDialog::get_message_area() which was new in gtkmm-2.22
-       //  released September 2010.
+       // Nicely formatted display of VG members by using a table below the secondary
+       // text in the dialog.
        Gtk::Box * msg_area = dialog .get_message_area() ;
 
        Gtk::HSeparator * hsep( manage( new Gtk::HSeparator() ) ) ;
@@ -3425,7 +3400,6 @@ bool Win_GParted::remove_non_empty_lvm2_pv_dialog( const OperationType optype )
        }
        table ->attach( * Utils::mk_label( members_str, true, false, true, 0.0 /* ALIGN_TOP */ ),
                        1, 2, top++, bottom++, Gtk::FILL ) ;
-#endif /* HAVE_GET_MESSAGE_AREA */
 
        dialog .add_button( Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL );
        dialog .add_button( Gtk::Stock::DELETE, Gtk::RESPONSE_OK );


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]