[glom/glom-1-18] Fix the build with gtkmm 2.23/24 with --enable-warnings=fatal.



commit 7f5ab68ed1fd16326134eef7893af52895946076
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 27 16:56:35 2011 +0100

    Fix the build with gtkmm 2.23/24 with --enable-warnings=fatal.
    
      * configure.ac: Require the latest gtkmm-2.4 version.
    * glom/mode_design/dialog_add_related_table.cc:
    * glom/mode_design/fields/dialog_fielddefinition.cc:
    * glom/mode_design/script_library/dialog_script_library.cc:
    * glom/mode_design/users/dialog_choose_user.cc:
    * glom/mode_design/users/dialog_users_list.cc:
    * glom/utility_widgets/db_adddel/db_adddel.cc: More use of the non-deprecated
    version of some methods.

 ChangeLog                                          |   13 +++++++++++++
 configure.ac                                       |    2 +-
 glom/mode_design/dialog_add_related_table.cc       |    4 ++--
 glom/mode_design/fields/dialog_fielddefinition.cc  |    4 ++--
 .../script_library/dialog_script_library.cc        |    4 ++--
 glom/mode_design/users/dialog_choose_user.cc       |    2 +-
 glom/mode_design/users/dialog_users_list.cc        |    8 ++++----
 glom/utility_widgets/db_adddel/db_adddel.cc        |    2 +-
 8 files changed, 26 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6398acf..4619ea9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2011-01-27  Murray Cumming  <murrayc murrayc com>
 
+	Fix the build with gtkmm 2.23/24 with --enable-warnings=fatal.
+
+  * configure.ac: Require the latest gtkmm-2.4 version.
+	* glom/mode_design/dialog_add_related_table.cc:
+	* glom/mode_design/fields/dialog_fielddefinition.cc:
+	* glom/mode_design/script_library/dialog_script_library.cc:
+	* glom/mode_design/users/dialog_choose_user.cc:
+	* glom/mode_design/users/dialog_users_list.cc:
+	* glom/utility_widgets/db_adddel/db_adddel.cc: More use of the non-deprecated 
+	version of some methods.
+
+2011-01-27  Murray Cumming  <murrayc murrayc com>
+
 	GimpRuler: Use the GTK+-2.0 version of this code.
 
 	* glom/utility_widgets/gimpruler/gimpruler.[h|c]: Use the version of the code
diff --git a/configure.ac b/configure.ac
index b732be2..8a7417f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ AS_IF([test "x$glom_host_win32" != xyes],
       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.3.1"])
 
 # Libraries used by Glom:
-REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-2.4 >= 2.22.0 gthread-2.0 libxml++-2.6 libxslt >= 1.1.10 goocanvasmm-1.0 >= 0.15.4"
+REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-2.4 >= 2.23.90 gthread-2.0 libxml++-2.6 libxslt >= 1.1.10 goocanvasmm-1.0 >= 0.15.4"
 
 # Do not require iso-codes in client-only mode, or on Windows:
 # TODO: Package iso-codes for Windows?
diff --git a/glom/mode_design/dialog_add_related_table.cc b/glom/mode_design/dialog_add_related_table.cc
index 218be5c..8043bc6 100644
--- a/glom/mode_design/dialog_add_related_table.cc
+++ b/glom/mode_design/dialog_add_related_table.cc
@@ -72,12 +72,12 @@ void Dialog_AddRelatedTable::set_fields(const Glib::ustring& table_name)
   const type_vec_fields fields = DbUtils::get_fields_for_table_from_database(table_name);
 
   //Show the fields:
-  m_combo_from_field->clear_items();
+  m_combo_from_field->remove_all();
   for(type_vec_fields::const_iterator iter = fields.begin(); iter != fields.end(); ++iter)
   {
      sharedptr<Field> item = *iter;
      if(item)
-       m_combo_from_field->append_text(item->get_name());
+       m_combo_from_field->append(item->get_name());
   }
 
 }
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc b/glom/mode_design/fields/dialog_fielddefinition.cc
index e3fbd27..1e68728 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -342,7 +342,7 @@ void Dialog_FieldDefinition::on_combo_lookup_relationship_changed()
 {
   //Get the fields that are avaiable from the new relationship:
 
-  m_pCombo_LookupField->clear_items();
+  m_pCombo_LookupField->remove_all();
 
   //Get the relationship name:
   sharedptr<const Relationship> relationship = m_pCombo_LookupRelationship->get_selected_relationship();
@@ -359,7 +359,7 @@ void Dialog_FieldDefinition::on_combo_lookup_relationship_changed()
         const type_vec_fields fields_in_to_table = get_fields_for_table(to_table);
         for(type_vec_fields::const_iterator iter = fields_in_to_table.begin(); iter != fields_in_to_table.end(); ++iter)
         {
-          m_pCombo_LookupField->append_text((*iter)->get_name());
+          m_pCombo_LookupField->append((*iter)->get_name());
         }
       }
     }
diff --git a/glom/mode_design/script_library/dialog_script_library.cc b/glom/mode_design/script_library/dialog_script_library.cc
index f357545..613f01d 100644
--- a/glom/mode_design/script_library/dialog_script_library.cc
+++ b/glom/mode_design/script_library/dialog_script_library.cc
@@ -199,12 +199,12 @@ void Dialog_ScriptLibrary::load_from_document()
     return;
 
   const std::vector<Glib::ustring> module_names = document->get_library_module_names();
-  m_combobox_name->clear_items();
+  m_combobox_name->remove_all();
  
   for(std::vector<Glib::ustring>::const_iterator iter = module_names.begin(); iter != module_names.end(); ++iter)
   {
     const Glib::ustring name = *iter;
-    m_combobox_name->append_text(name);
+    m_combobox_name->append(name);
   }
 
   //Show the current script, or the first one, if there is one:
diff --git a/glom/mode_design/users/dialog_choose_user.cc b/glom/mode_design/users/dialog_choose_user.cc
index b8138dd..aa78a88 100644
--- a/glom/mode_design/users/dialog_choose_user.cc
+++ b/glom/mode_design/users/dialog_choose_user.cc
@@ -41,7 +41,7 @@ void Dialog_ChooseUser::set_user_list(const type_vec_strings& users)
 {
   for(type_vec_strings::const_iterator iter = users.begin(); iter != users.end(); ++iter)
   {
-    m_combo_name->append_text(*iter);
+    m_combo_name->append(*iter);
   }
 
   m_combo_name->set_first_active();
diff --git a/glom/mode_design/users/dialog_users_list.cc b/glom/mode_design/users/dialog_users_list.cc
index 53202ea..d15a996 100644
--- a/glom/mode_design/users/dialog_users_list.cc
+++ b/glom/mode_design/users/dialog_users_list.cc
@@ -280,12 +280,12 @@ void Dialog_UsersList::on_button_user_edit()
       dialog->m_entry_user->set_sensitive(false); //They can edit the password, but not the name. TODO: Allow editing of name?
 
       //Fill groups:
-      dialog->m_combo_group->clear_items();
+      dialog->m_combo_group->remove_all();
 
       type_vec_strings group_list = Privs::get_database_groups();
       for(type_vec_strings::const_iterator iter = group_list.begin(); iter != group_list.end(); ++iter)
       {
-         dialog->m_combo_group->append_text(*iter);
+         dialog->m_combo_group->append(*iter);
       }
 
       dialog->m_combo_group->set_active_text(m_combo_group->get_active_text());
@@ -373,12 +373,12 @@ void Dialog_UsersList::fill_list()
 void Dialog_UsersList::set_group(const Glib::ustring& group_name)
 {
   //Fill the list of groups:
-  m_combo_group->clear_items();
+  m_combo_group->remove_all();
 
   type_vec_strings group_list = Privs::get_database_groups();
   for(type_vec_strings::const_iterator iter = group_list.begin(); iter != group_list.end(); ++iter)
   {
-    m_combo_group->append_text(*iter);
+    m_combo_group->append(*iter);
   }
 
   m_combo_group->set_active_text(group_name);
diff --git a/glom/utility_widgets/db_adddel/db_adddel.cc b/glom/utility_widgets/db_adddel/db_adddel.cc
index 79b1de8..7289407 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@ -1829,7 +1829,7 @@ void DbAddDel::on_idle_treeview_cell_edited_revert(const Gtk::TreeModel::Row& ro
     return;
   }
 
-  Gtk::CellRendererText* pCell = dynamic_cast<Gtk::CellRendererText*>(pColumn->get_first_cell_renderer());
+  Gtk::CellRendererText* pCell = dynamic_cast<Gtk::CellRendererText*>(pColumn->get_first_cell());
   if(!pCell)
   {
     std::cerr << G_STRFUNC << ": pCell is null." << std::endl;



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