[glom] Reduce use of the derived ComboBoxText.

[Murray Cumming <murrayc src gnome org>]

commit e5d1630e60cc3e613887edb03b1c7cc2b08c4fb8
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Mar 12 14:20:22 2012 +0100

    Reduce use of the derived ComboBoxText.

 ChangeLog                                          |    4 ++++
 glom/mode_design/dialog_add_related_table.cc       |    2 +-
 glom/mode_design/dialog_add_related_table.h        |    4 ++--
 glom/mode_design/fields/dialog_fielddefinition.cc  |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.h   |    4 ++--
 glom/mode_design/layout/dialog_choose_field.h      |    1 -
 .../layout/dialog_layout_calendar_related.h        |    1 -
 .../layout/dialog_layout_list_related.h            |    1 -
 .../layout_item_dialogs/dialog_field_layout.h      |    1 -
 .../layout_item_dialogs/dialog_field_summary.h     |    1 -
 .../layout/layout_item_dialogs/dialog_formatting.h |    1 -
 .../layout/layout_item_dialogs/dialog_group_by.h   |    1 -
 glom/mode_design/users/dialog_users_list.cc        |    2 +-
 glom/mode_design/users/dialog_users_list.h         |    5 +++--
 14 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b25fc28..e6a6300 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-12  Murray Cumming  <murrayc murrayc com>
 
+	Reduce use of the derived ComboBoxText.
+
+2012-03-12  Murray Cumming  <murrayc murrayc com>
+
 	Remove some unused member variables.
 
 	* glom/mode_data/box_data_list.[h|cc]:
diff --git a/glom/mode_design/dialog_add_related_table.cc b/glom/mode_design/dialog_add_related_table.cc
index 8043bc6..e3e572b 100644
--- a/glom/mode_design/dialog_add_related_table.cc
+++ b/glom/mode_design/dialog_add_related_table.cc
@@ -40,7 +40,7 @@ Dialog_AddRelatedTable::Dialog_AddRelatedTable(BaseObjectType* cobject, const Gl
 {
   builder->get_widget("entry_related_table_name", m_entry_table_name);
   builder->get_widget("entry_relationship_name", m_entry_relationship_name);
-  builder->get_widget_derived("combobox_from_key", m_combo_from_field);
+  builder->get_widget("combobox_from_key", m_combo_from_field);
 
   //Connect signals:
   m_combo_from_field->signal_changed().connect( sigc::mem_fun(*this, &Dialog_AddRelatedTable::on_combo_field_name) );
diff --git a/glom/mode_design/dialog_add_related_table.h b/glom/mode_design/dialog_add_related_table.h
index 20da37d..888cb85 100644
--- a/glom/mode_design/dialog_add_related_table.h
+++ b/glom/mode_design/dialog_add_related_table.h
@@ -24,7 +24,7 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/entry.h>
-#include <glom/utility_widgets/combo_textglade.h>
+#include <gtkmm/comboboxtext.h>
 #include <glom/base_db.h>
 
 namespace Glom
@@ -57,7 +57,7 @@ private:
 
   Gtk::Entry* m_entry_table_name;
   Gtk::Entry* m_entry_relationship_name;
-  Combo_TextGlade* m_combo_from_field;
+  Gtk::ComboBoxText* m_combo_from_field;
   Gtk::Button* m_button_edit_fields;
   Gtk::Button* m_button_ok;
 
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc b/glom/mode_design/fields/dialog_fielddefinition.cc
index 30998a9..406a3b0 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -59,7 +59,7 @@ Dialog_FieldDefinition::Dialog_FieldDefinition(BaseObjectType* cobject, const Gl
   builder->get_widget("checkbutton_lookup",  m_pCheck_Lookup);
   builder->get_widget("table_lookup",  m_pTable_Lookup);
   builder->get_widget_derived("combobox_lookup_relationship",  m_pCombo_LookupRelationship);
-  builder->get_widget_derived("combobox_lookup_field",  m_pCombo_LookupField);
+  builder->get_widget("combobox_lookup_field",  m_pCombo_LookupField);
 
   builder->get_widget("radiobutton_calculate",  m_pRadio_Calculate);
   builder->get_widget("alignment_calculate",  m_pAlignment_Calculate);
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h b/glom/mode_design/fields/dialog_fielddefinition.h
index 9aee1c7..3afb112 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -23,9 +23,9 @@
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/checkbutton.h>
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/entry.h>
-#include "../../utility_widgets/combo_textglade.h"
 #include <glom/mode_design/layout/combobox_relationship.h>
 #include "combo_fieldtype.h"
 //#include "../../utility_widgets/entry_numerical.h"
@@ -83,7 +83,7 @@ private:
   Gtk::CheckButton* m_pCheck_Lookup;
   Gtk::Widget* m_pTable_Lookup; //So we can make it insensitive.
   ComboBox_Relationship* m_pCombo_LookupRelationship;
-  Combo_TextGlade* m_pCombo_LookupField;
+  Gtk::ComboBoxText* m_pCombo_LookupField;
 
   Gtk::RadioButton* m_pRadio_Calculate;
   Gtk::Alignment* m_pAlignment_Calculate;
diff --git a/glom/mode_design/layout/dialog_choose_field.h b/glom/mode_design/layout/dialog_choose_field.h
index 8bcbeb8..451bd31 100644
--- a/glom/mode_design/layout/dialog_choose_field.h
+++ b/glom/mode_design/layout/dialog_choose_field.h
@@ -26,7 +26,6 @@
 #include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
 #include <glom/box_withbuttons.h>
-#include <glom/utility_widgets/combo_textglade.h>
 #include <glom/mode_design/layout/combobox_relationship.h>
 #include <glom/mode_design/comboentry_currency.h>
 
diff --git a/glom/mode_design/layout/dialog_layout_calendar_related.h b/glom/mode_design/layout/dialog_layout_calendar_related.h
index 0c63375..2ebf239 100644
--- a/glom/mode_design/layout/dialog_layout_calendar_related.h
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.h
@@ -23,7 +23,6 @@
 
 #include <glom/mode_design/layout/dialog_layout_list.h>
 #include <libglom/data_structure/layout/layoutitem_calendarportal.h>
-#include <glom/utility_widgets/combo_textglade.h>
 #include <glom/mode_design/layout/combobox_relationship.h>
 #include <glom/mode_design/layout/combobox_fields.h>
 #include <gtkmm/checkbutton.h>
diff --git a/glom/mode_design/layout/dialog_layout_list_related.h b/glom/mode_design/layout/dialog_layout_list_related.h
index edacb69..1aa0468 100644
--- a/glom/mode_design/layout/dialog_layout_list_related.h
+++ b/glom/mode_design/layout/dialog_layout_list_related.h
@@ -22,7 +22,6 @@
 #define GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_RELATED_H
 
 #include <glom/mode_design/layout/dialog_layout_list.h>
-#include <glom/utility_widgets/combo_textglade.h>
 #include <glom/mode_design/layout/combobox_relationship.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/radiobutton.h>
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
index ca72ea7..c98be6f 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
@@ -27,7 +27,6 @@
 #include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/view.h>
 #include <glom/box_withbuttons.h>
-#include <glom/utility_widgets/combo_textglade.h>
 #include <glom/mode_design/comboentry_currency.h>
 #include "box_formatting.h"
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
index 97d5af1..353daf9 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h
@@ -28,7 +28,6 @@
 #include <libglom/document/document.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
 #include <glom/box_withbuttons.h>
-#include <glom/utility_widgets/combo_textglade.h>
 #include "combo_summarytype.h"
 
 namespace Glom
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_formatting.h b/glom/mode_design/layout/layout_item_dialogs/dialog_formatting.h
index 614dc23..a5639f8 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_formatting.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_formatting.h
@@ -25,7 +25,6 @@
 #include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/view.h>
 #include <glom/box_withbuttons.h>
-#include <glom/utility_widgets/combo_textglade.h>
 #include <glom/mode_design/comboentry_currency.h>
 #include "box_formatting.h"
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
index 11e98b1..e2aae28 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
@@ -27,7 +27,6 @@
 #include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
 #include <glom/box_withbuttons.h>
-#include <glom/utility_widgets/combo_textglade.h>
 #include <glom/mode_design/comboentry_currency.h>
 #include "dialog_fieldslist.h"
 #include "dialog_sortfields.h"
diff --git a/glom/mode_design/users/dialog_users_list.cc b/glom/mode_design/users/dialog_users_list.cc
index 94fc831..8cda2bb 100644
--- a/glom/mode_design/users/dialog_users_list.cc
+++ b/glom/mode_design/users/dialog_users_list.cc
@@ -44,7 +44,7 @@ Dialog_UsersList::Dialog_UsersList(BaseObjectType* cobject, const Glib::RefPtr<G
   m_button_user_delete(0),
   m_button_user_edit(0)
 {
-  builder->get_widget_derived("combobox_group", m_combo_group);
+  builder->get_widget("combobox_group", m_combo_group);
   m_combo_group->signal_changed().connect(sigc::mem_fun(*this, &Dialog_UsersList::on_combo_group_changed));
 
 
diff --git a/glom/mode_design/users/dialog_users_list.h b/glom/mode_design/users/dialog_users_list.h
index 064be3d..9793ba0 100644
--- a/glom/mode_design/users/dialog_users_list.h
+++ b/glom/mode_design/users/dialog_users_list.h
@@ -24,8 +24,9 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/builder.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/liststore.h>
 #include <glom/base_db.h>
-#include "../../utility_widgets/combo_textglade.h"
 
 namespace Glom
 {
@@ -89,7 +90,7 @@ private:
   ModelColumnsUsers m_model_columns_users;
 
   Gtk::TreeView* m_treeview_users;
-  Combo_TextGlade* m_combo_group;
+  Gtk::ComboBoxText* m_combo_group;
   Gtk::Button* m_button_user_add;
   Gtk::Button* m_button_user_remove;
   Gtk::Button* m_button_user_new;