[glom] Fix the build with latest gtkmm from git master.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Fix the build with latest gtkmm from git master.
- Date: Fri, 3 Dec 2010 17:02:25 +0000 (UTC)
commit 53fa45daca08ccc41368ef11dbb92e3bd3c3aafd
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Dec 3 18:02:13 2010 +0100
Fix the build with latest gtkmm from git master.
* 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: Adapt to the ComoboBoxText
append_text() -> append() change.
ChangeLog | 11 +++++++++++
glom/mode_design/dialog_add_related_table.cc | 2 +-
glom/mode_design/fields/dialog_fielddefinition.cc | 2 +-
.../script_library/dialog_script_library.cc | 2 +-
glom/mode_design/users/dialog_choose_user.cc | 2 +-
glom/mode_design/users/dialog_users_list.cc | 4 ++--
6 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ba42ab1..66ce59a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-03 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with latest gtkmm from git master.
+
+ * 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: Adapt to the ComoboBoxText
+ append_text() -> append() change.
+
2010-11-29 Murray Cumming <murrayc murrayc com>
Replaced GtkRuler with GimpRuler because GtkRuler was removed from GTK 3.
diff --git a/glom/mode_design/dialog_add_related_table.cc b/glom/mode_design/dialog_add_related_table.cc
index 8bb0605..8043bc6 100644
--- a/glom/mode_design/dialog_add_related_table.cc
+++ b/glom/mode_design/dialog_add_related_table.cc
@@ -77,7 +77,7 @@ void Dialog_AddRelatedTable::set_fields(const Glib::ustring& table_name)
{
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 7910f24..0cb4714 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -368,7 +368,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 0bc635d..5eff0e8 100644
--- a/glom/mode_design/script_library/dialog_script_library.cc
+++ b/glom/mode_design/script_library/dialog_script_library.cc
@@ -207,7 +207,7 @@ void Dialog_ScriptLibrary::load_from_document()
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 07c8ffd..5c34910 100644
--- a/glom/mode_design/users/dialog_users_list.cc
+++ b/glom/mode_design/users/dialog_users_list.cc
@@ -291,7 +291,7 @@ void Dialog_UsersList::on_button_user_edit()
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());
@@ -384,7 +384,7 @@ void Dialog_UsersList::set_group(const Glib::ustring& group_name)
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]