[glom/gtkmm4v4] gtkmm4: Adapt to static Builder::get_widget_derived().

[Murray Cumming <murrayc src gnome org>]

commit e6b4fd14bec4518b44c8479220c03c728976a359
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 18 18:03:18 2017 +0200

    gtkmm4: Adapt to static Builder::get_widget_derived().

 glom/appwindow.cc                                  |    4 ++--
 glom/frame_glom.cc                                 |    2 +-
 glom/glade_utils.h                                 |    2 +-
 glom/mode_design/dialog_database_preferences.cc    |    2 +-
 glom/mode_design/dialog_fields.cc                  |    2 +-
 glom/mode_design/dialog_relationships.cc           |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.cc  |    4 ++--
 glom/mode_design/layout/dialog_choose_field.cc     |    2 +-
 .../layout/dialog_layout_calendar_related.cc       |    6 +++---
 .../layout/dialog_layout_list_related.cc           |    4 ++--
 .../layout/layout_item_dialogs/box_formatting.cc   |    8 ++++----
 .../layout_item_dialogs/dialog_field_summary.cc    |    2 +-
 .../layout/layout_item_dialogs/dialog_group_by.cc  |    2 +-
 .../layout_item_dialogs/dialog_imageobject.cc      |    2 +-
 .../script_library/dialog_script_library.cc        |    2 +-
 .../translation/dialog_change_language.cc          |    2 +-
 .../translation/dialog_copy_translation.cc         |    2 +-
 .../translation/dialog_identify_original.cc        |    2 +-
 .../mode_design/translation/window_translations.cc |    2 +-
 glom/mode_design/users/dialog_choose_user.cc       |    2 +-
 glom/mode_design/users/dialog_user.cc              |    2 +-
 21 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index 97bc526..1680308 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -108,8 +108,8 @@ AppWindow::AppWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&
 
   //Load widgets from glade file:
   builder->get_widget("bakery_vbox", m_box_top);
-  builder->get_widget_derived("vbox_frame", m_frame); //This one is derived. There's a lot happening here.
-  builder->get_widget_derived("infobar_progress", m_infobar_progress);
+  Gtk::Builder::get_widget_derived(builder, "vbox_frame", m_frame); //This one is derived. There's a lot 
happening here.
+  Gtk::Builder::get_widget_derived(builder, "infobar_progress", m_infobar_progress);
 
   //Add menu bar at the top:
   auto object =
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index c1e97a4..a4b56e6 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -129,7 +129,7 @@ Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
   m_box_quick_find->hide();
 
   PlaceHolder* placeholder_quickfind = nullptr;
-  builder->get_widget_derived("vbox_quickfind", placeholder_quickfind);
+  Gtk::Builder::get_widget_derived(builder, "vbox_quickfind", placeholder_quickfind);
   if(placeholder_quickfind)
     placeholder_quickfind->add(*m_box_quick_find);
 
diff --git a/glom/glade_utils.h b/glom/glade_utils.h
index 5364077..2c18ddd 100644
--- a/glom/glade_utils.h
+++ b/glom/glade_utils.h
@@ -78,7 +78,7 @@ Glib::RefPtr<Gtk::Builder> helper_get_glade_widget_derived_with_warning(const st
 
   if(refXml)
   {
-    refXml->get_widget_derived(id, widget);
+    Gtk::Builder::get_widget_derived(refXml, id, widget);
   }
 
   return refXml;
diff --git a/glom/mode_design/dialog_database_preferences.cc b/glom/mode_design/dialog_database_preferences.cc
index 1914fe4..67aa450 100644
--- a/glom/mode_design/dialog_database_preferences.cc
+++ b/glom/mode_design/dialog_database_preferences.cc
@@ -49,7 +49,7 @@ Dialog_Database_Preferences::Dialog_Database_Preferences(BaseObjectType* cobject
   m_glade_variables_map.connect_widget("entry_org_address_country", m_system_prefs.m_org_address_country);
   m_glade_variables_map.connect_widget("entry_org_address_postcode", m_system_prefs.m_org_address_postcode);
 
-  builder->get_widget_derived("imageglom", m_image);
+  Gtk::Builder::get_widget_derived(builder, "imageglom", m_image);
   builder->get_widget("button_choose_image", m_button_choose_image);
   m_button_choose_image->signal_clicked().connect(sigc::mem_fun(*this, 
&Dialog_Database_Preferences::on_button_choose_image));
 
diff --git a/glom/mode_design/dialog_fields.cc b/glom/mode_design/dialog_fields.cc
index 032ec7e..70b4be8 100644
--- a/glom/mode_design/dialog_fields.cc
+++ b/glom/mode_design/dialog_fields.cc
@@ -32,7 +32,7 @@ Dialog_Fields::Dialog_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Bu
 : Dialog_Design(cobject, builder),
   m_box(nullptr)
 {
-  builder->get_widget_derived("vbox_placeholder", m_box);
+  Gtk::Builder::get_widget_derived(builder, "vbox_placeholder", m_box);
 
   //Fill composite view:
   add_view(m_box);
diff --git a/glom/mode_design/dialog_relationships.cc b/glom/mode_design/dialog_relationships.cc
index 66d0897..33461a4 100644
--- a/glom/mode_design/dialog_relationships.cc
+++ b/glom/mode_design/dialog_relationships.cc
@@ -32,7 +32,7 @@ Dialog_Relationships::Dialog_Relationships(BaseObjectType* cobject, const Glib::
 : Dialog_Design(cobject, builder),
   m_box(nullptr)
 {
-  builder->get_widget_derived("vbox_placeholder", m_box);
+  Gtk::Builder::get_widget_derived(builder, "vbox_placeholder", m_box);
 
   //Fill composite view:
   add_view(m_box);
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc 
b/glom/mode_design/fields/dialog_fielddefinition.cc
index 94d5058..7607f94 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -38,7 +38,7 @@ Dialog_FieldDefinition::Dialog_FieldDefinition(BaseObjectType* cobject, const Gl
 : Dialog_Properties(cobject, builder),
   m_data_idget_default_value_simple(nullptr)
 {
-  builder->get_widget_derived("combobox_type", m_combo_type);
+  Gtk::Builder::get_widget_derived(builder, "combobox_type", m_combo_type);
 
   builder->get_widget("entry_name", m_entry_name);
   builder->get_widget("entry_title", m_entry_title);
@@ -56,7 +56,7 @@ Dialog_FieldDefinition::Dialog_FieldDefinition(BaseObjectType* cobject, const Gl
 
   builder->get_widget("checkbutton_lookup",  m_check_lookup);
   builder->get_widget("table_lookup",  m_table_lookup);
-  builder->get_widget_derived("combobox_lookup_relationship",  m_combo_lookup_relationship);
+  Gtk::Builder::get_widget_derived(builder, "combobox_lookup_relationship",  m_combo_lookup_relationship);
   builder->get_widget("combobox_lookup_field",  m_combo_lookup_field);
 
   builder->get_widget("radiobutton_calculate",  m_radio_calculate);
diff --git a/glom/mode_design/layout/dialog_choose_field.cc b/glom/mode_design/layout/dialog_choose_field.cc
index 15c7f34..057d530 100644
--- a/glom/mode_design/layout/dialog_choose_field.cc
+++ b/glom/mode_design/layout/dialog_choose_field.cc
@@ -44,7 +44,7 @@ Dialog_ChooseField::Dialog_ChooseField(BaseObjectType* cobject, const Glib::RefP
   m_checkbutton_show_related_relationships->signal_toggled().connect(sigc::mem_fun(*this, 
&Dialog_ChooseField::on_checkbutton_related_relationships_toggled));
 
   builder->get_widget("button_select", m_button_select);
-  builder->get_widget_derived("combobox_relationship", m_combo_relationship);
+  Gtk::Builder::get_widget_derived(builder, "combobox_relationship", m_combo_relationship);
   if(m_combo_relationship)
   {
     m_combo_relationship->signal_changed().connect(sigc::mem_fun(*this, 
&Dialog_ChooseField::on_combo_relationship_changed));
diff --git a/glom/mode_design/layout/dialog_layout_calendar_related.cc 
b/glom/mode_design/layout/dialog_layout_calendar_related.cc
index f77c2ac..711a06f 100644
--- a/glom/mode_design/layout/dialog_layout_calendar_related.cc
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.cc
@@ -48,7 +48,7 @@ Dialog_Layout_Calendar_Related::Dialog_Layout_Calendar_Related(BaseObjectType* c
   m_box_related_table_widgets->show();
   m_box_related_navigation->show();
 
-  builder->get_widget_derived("combo_relationship_name", m_combo_relationship);
+  Gtk::Builder::get_widget_derived(builder, "combo_relationship_name", m_combo_relationship);
   if(m_combo_relationship)
   {
     m_combo_relationship->signal_changed().connect(sigc::mem_fun(*this, 
&Dialog_Layout_Calendar_Related::on_combo_relationship_changed));
@@ -66,14 +66,14 @@ Dialog_Layout_Calendar_Related::Dialog_Layout_Calendar_Related(BaseObjectType* c
   make_sensitivity_depend_on_toggle_button(*m_radio_navigation_automatic, *m_label_navigation_automatic);
 
   builder->get_widget("radiobutton_navigation_specify", m_radio_navigation_specify);
-  builder->get_widget_derived("combobox_navigation_specify", m_combo_navigation_specify);
+  Gtk::Builder::get_widget_derived(builder, "combobox_navigation_specify", m_combo_navigation_specify);
   if(m_radio_navigation_specify && m_combo_navigation_specify)
   {
     make_sensitivity_depend_on_toggle_button(*m_radio_navigation_specify, *m_combo_navigation_specify);
     m_combo_navigation_specify->signal_changed().connect(sigc::mem_fun(*this, 
&Dialog_Layout_Calendar_Related::on_combo_navigation_specific_changed));
   }
 
-  builder->get_widget_derived("combobox_date_field", m_combobox_date_field);
+  Gtk::Builder::get_widget_derived(builder, "combobox_date_field", m_combobox_date_field);
   if(m_combobox_date_field)
   {
     m_combobox_date_field->signal_changed().connect(sigc::mem_fun(*this, 
&Dialog_Layout_Calendar_Related::on_combo_date_field_changed));
diff --git a/glom/mode_design/layout/dialog_layout_list_related.cc 
b/glom/mode_design/layout/dialog_layout_list_related.cc
index 9f23750..e34d8e5 100644
--- a/glom/mode_design/layout/dialog_layout_list_related.cc
+++ b/glom/mode_design/layout/dialog_layout_list_related.cc
@@ -64,7 +64,7 @@ Dialog_Layout_List_Related::Dialog_Layout_List_Related(BaseObjectType* cobject,
   m_spinbutton_rows_count_max->signal_value_changed().connect(
     sigc::mem_fun(*this, &Dialog_Layout_List_Related::on_spinbutton_changed));
 
-  builder->get_widget_derived("combo_relationship_name", m_combo_relationship);
+  Gtk::Builder::get_widget_derived(builder, "combo_relationship_name", m_combo_relationship);
   if(m_combo_relationship)
   {
     m_combo_relationship->signal_changed().connect(sigc::mem_fun(*this, 
&Dialog_Layout_List_Related::on_combo_relationship_changed));
@@ -84,7 +84,7 @@ Dialog_Layout_List_Related::Dialog_Layout_List_Related(BaseObjectType* cobject,
   builder->get_widget("radiobutton_navigation_none", m_radio_navigation_none);
 
   builder->get_widget("radiobutton_navigation_specify", m_radio_navigation_specify);
-  builder->get_widget_derived("combobox_navigation_specify", m_combo_navigation_specify);
+  Gtk::Builder::get_widget_derived(builder, "combobox_navigation_specify", m_combo_navigation_specify);
   if(m_radio_navigation_specify && m_combo_navigation_specify)
   {
     make_sensitivity_depend_on_toggle_button(*m_radio_navigation_specify, *m_combo_navigation_specify);
diff --git a/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc 
b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
index bcd6a6d..fd8b6d6 100644
--- a/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
@@ -81,7 +81,7 @@ Box_Formatting::Box_Formatting(BaseObjectType* cobject, const Glib::RefPtr<Gtk::
   builder->get_widget("checkbutton_format_thousands", m_checkbox_format_use_thousands);
   builder->get_widget("checkbutton_format_use_decimal_places", m_checkbox_format_use_decimal_places);
   builder->get_widget("entry_format_decimal_places", m_entry_format_decimal_places);
-  builder->get_widget_derived("entry_currency_symbol", m_entry_currency_symbol);
+  Gtk::Builder::get_widget_derived(builder, "entry_currency_symbol", m_entry_currency_symbol);
   builder->get_widget("checkbutton_foreground_negatives", m_checkbox_format_color_negatives);
 
   //Text formatting:
@@ -130,7 +130,7 @@ Box_Formatting::Box_Formatting(BaseObjectType* cobject, const Glib::RefPtr<Gtk::
 
   //Choices:
   builder->get_widget("vbox_choices", m_vbox_choices);
-  builder->get_widget_derived("adddel_choices", m_adddel_choices_custom);
+  Gtk::Builder::get_widget_derived(builder, "adddel_choices", m_adddel_choices_custom);
   m_col_index_custom_choices = m_adddel_choices_custom->add_column("Choices");
   m_adddel_choices_custom->set_allow_add();
   m_adddel_choices_custom->set_allow_delete();
@@ -139,8 +139,8 @@ Box_Formatting::Box_Formatting(BaseObjectType* cobject, const Glib::RefPtr<Gtk::
   builder->get_widget("checkbutton_choices_restrict", m_checkbutton_choices_restricted);
   builder->get_widget("checkbutton_choices_restrict_as_radio_buttons", 
m_checkbutton_choices_restricted_as_radio_buttons);
 
-  builder->get_widget_derived("combobox_choices_related_relationship", m_combo_choices_relationship);
-  builder->get_widget_derived("combobox_choices_related_field", m_combo_choices_field);
+  Gtk::Builder::get_widget_derived(builder, "combobox_choices_related_relationship", 
m_combo_choices_relationship);
+  Gtk::Builder::get_widget_derived(builder, "combobox_choices_related_field", m_combo_choices_field);
   builder->get_widget("label_choices_related_extra_fields", m_label_choices_extra_fields);
   builder->get_widget("button_choices_related_extra_fields", m_button_choices_extra_fields);
   builder->get_widget("label_choices_related_sortby", m_label_choices_sortby);
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc 
b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc
index 7db085c..b40d7fa 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc
@@ -33,7 +33,7 @@ Dialog_FieldSummary::Dialog_FieldSummary(BaseObjectType* cobject, const Glib::Re
   m_button_field(nullptr)
 {
   builder->get_widget("label_field", m_label_field);
-  builder->get_widget_derived("combobox_summarytype", m_combo_summarytype);
+  Gtk::Builder::get_widget_derived(builder, "combobox_summarytype", m_combo_summarytype);
 
   builder->get_widget("button_field", m_button_field);
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc 
b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
index 843347e..c0d9e31 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
@@ -53,7 +53,7 @@ Dialog_GroupBy::Dialog_GroupBy(BaseObjectType* cobject, const Glib::RefPtr<Gtk::
   builder->get_widget("button_select_sort_by", m_button_field_sort_by);
   builder->get_widget("button_secondary_edit", m_button_secondary_fields);
 
-  builder->get_widget_derived("comboboxentry_border_width", m_comboboxentry_border_width);
+  Gtk::Builder::get_widget_derived(builder, "comboboxentry_border_width", m_comboboxentry_border_width);
 
   //Connect signals:
   m_button_field_group_by->signal_clicked().connect(sigc::mem_fun(*this, 
&Dialog_GroupBy::on_button_field_group_by));
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc 
b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
index 308597c..c1a6c01 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
@@ -39,7 +39,7 @@ Dialog_ImageObject::Dialog_ImageObject(BaseObjectType* cobject, const Glib::RefP
 {
   builder->get_widget("vbox_title", m_box_title);
   builder->get_widget("entry_title", m_entry_title);
-  builder->get_widget_derived("imageglom", m_image);
+  Gtk::Builder::get_widget_derived(builder, "imageglom", m_image);
 
   builder->get_widget("button_choose_image", m_button_choose_image);
   m_button_choose_image->signal_clicked().connect(sigc::mem_fun(*this, 
&Dialog_ImageObject::on_button_choose));
diff --git a/glom/mode_design/script_library/dialog_script_library.cc 
b/glom/mode_design/script_library/dialog_script_library.cc
index 3d31673..7788ccf 100644
--- a/glom/mode_design/script_library/dialog_script_library.cc
+++ b/glom/mode_design/script_library/dialog_script_library.cc
@@ -40,7 +40,7 @@ Dialog_ScriptLibrary::Dialog_ScriptLibrary(BaseObjectType* cobject, const Glib::
 : Gtk::Dialog(cobject)
 {
   //Get child widgets:
-  builder->get_widget_derived("combobox_name", m_combobox_name);
+  Gtk::Builder::get_widget_derived(builder, "combobox_name", m_combobox_name);
   builder->get_widget("textview_script",  m_text_view);
   builder->get_widget("button_check",  m_button_check);
   builder->get_widget("button_add",  m_button_add);
diff --git a/glom/mode_design/translation/dialog_change_language.cc 
b/glom/mode_design/translation/dialog_change_language.cc
index 99e8dfd..358f508 100644
--- a/glom/mode_design/translation/dialog_change_language.cc
+++ b/glom/mode_design/translation/dialog_change_language.cc
@@ -31,7 +31,7 @@ Dialog_ChangeLanguage::Dialog_ChangeLanguage(BaseObjectType* cobject, const Glib
 : Gtk::Dialog(cobject),
   m_combo_locale(nullptr)
 {
-  builder->get_widget_derived("combobox_locale", m_combo_locale);
+  Gtk::Builder::get_widget_derived(builder, "combobox_locale", m_combo_locale);
   if(m_combo_locale)
     m_combo_locale->set_selected_locale(AppWindow::get_current_locale());
 }
diff --git a/glom/mode_design/translation/dialog_copy_translation.cc 
b/glom/mode_design/translation/dialog_copy_translation.cc
index a39448e..4edf903 100644
--- a/glom/mode_design/translation/dialog_copy_translation.cc
+++ b/glom/mode_design/translation/dialog_copy_translation.cc
@@ -31,7 +31,7 @@ Dialog_CopyTranslation::Dialog_CopyTranslation(BaseObjectType* cobject, const Gl
 : Gtk::Dialog(cobject),
   m_combo_locale(nullptr)
 {
-  builder->get_widget_derived("combobox_locale", m_combo_locale);
+  Gtk::Builder::get_widget_derived(builder, "combobox_locale", m_combo_locale);
   if(m_combo_locale)
     m_combo_locale->set_selected_locale(AppWindow::get_current_locale());
 }
diff --git a/glom/mode_design/translation/dialog_identify_original.cc 
b/glom/mode_design/translation/dialog_identify_original.cc
index 682d4b4..8a82fdf 100644
--- a/glom/mode_design/translation/dialog_identify_original.cc
+++ b/glom/mode_design/translation/dialog_identify_original.cc
@@ -36,7 +36,7 @@ Dialog_IdentifyOriginal::Dialog_IdentifyOriginal(BaseObjectType* cobject, const
   m_combo_locale(nullptr)
 {
   builder->get_widget("label_original", m_label_original);
-  builder->get_widget_derived("combobox_locale", m_combo_locale);
+  Gtk::Builder::get_widget_derived(builder, "combobox_locale", m_combo_locale);
   if(m_combo_locale)
     m_combo_locale->set_selected_locale(AppWindow::get_current_locale());
 }
diff --git a/glom/mode_design/translation/window_translations.cc 
b/glom/mode_design/translation/window_translations.cc
index 6045348..16600ec 100644
--- a/glom/mode_design/translation/window_translations.cc
+++ b/glom/mode_design/translation/window_translations.cc
@@ -89,7 +89,7 @@ Window_Translations::Window_Translations(BaseObjectType* cobject, const Glib::Re
     m_button_identify->signal_clicked().connect( sigc::mem_fun(*this, 
&Window_Translations::on_button_identify) );
   }
 
-  builder->get_widget_derived("combobox_target_locale", m_combo_target_locale);
+  Gtk::Builder::get_widget_derived(builder, "combobox_target_locale", m_combo_target_locale);
   if(m_combo_target_locale)
   {
     m_combo_target_locale->signal_changed().connect(sigc::mem_fun(*this, 
&Window_Translations::on_combo_target_locale_changed));
diff --git a/glom/mode_design/users/dialog_choose_user.cc b/glom/mode_design/users/dialog_choose_user.cc
index 5148f07..2104167 100644
--- a/glom/mode_design/users/dialog_choose_user.cc
+++ b/glom/mode_design/users/dialog_choose_user.cc
@@ -30,7 +30,7 @@ Dialog_ChooseUser::Dialog_ChooseUser(BaseObjectType* cobject, const Glib::RefPtr
 : Gtk::Dialog(cobject),
   m_combo_name(nullptr)
 {
-  builder->get_widget_derived("combo_user_name", m_combo_name);
+  Gtk::Builder::get_widget_derived(builder, "combo_user_name", m_combo_name);
 }
 
 void Dialog_ChooseUser::set_user_list(const type_vec_strings& users)
diff --git a/glom/mode_design/users/dialog_user.cc b/glom/mode_design/users/dialog_user.cc
index 90a5c23..fd1c809 100644
--- a/glom/mode_design/users/dialog_user.cc
+++ b/glom/mode_design/users/dialog_user.cc
@@ -37,7 +37,7 @@ Dialog_User::Dialog_User(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builde
 
   builder->get_widget("entry_user", m_entry_user);
   m_entry_user->set_max_length(Privs::MAX_ROLE_SIZE);
-  builder->get_widget_derived("combobox_group", m_combo_group);
+  Gtk::Builder::get_widget_derived(builder, "combobox_group", m_combo_group);
 
   builder->get_widget("entry_password", m_entry_password);
   m_entry_password->set_max_length(Privs::MAX_ROLE_SIZE); //Let's assume that this has a similar 
(undocumented in PostgreSQL) max size as the user.