[glom/glom-1-18] Fix ComboBoxEntry removal.

[Murray Cumming <murrayc src gnome org>]

commit a861d3a0c3ded05bd013293b6caf9889c36fa46e
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 27 16:14:20 2011 +0100

    Fix ComboBoxEntry removal.
    
    * glom/mode_data/datawidget/comboentry.cc:
    * glom/mode_design/comboentry_currency.cc:
    * glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidt
    h.[h|cc]:
    * glom/variablesmap.cc: Use only non-deprecated ComobBox API.

 ChangeLog                                          |   10 ++++++++++
 glom/mode_data/datawidget/comboentry.cc            |    2 +-
 glom/mode_design/comboentry_currency.cc            |    2 +-
 .../layout_item_dialogs/comboentry_borderwidth.cc  |    2 +-
 .../layout_item_dialogs/comboentry_borderwidth.h   |    2 +-
 glom/variablesmap.cc                               |    2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e597717..84b24d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-27  Murray Cumming  <murrayc murrayc com>
+
+	Fix ComboBoxEntry removal.
+
+	* glom/mode_data/datawidget/comboentry.cc:
+	* glom/mode_design/comboentry_currency.cc:
+	* glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidt
+	h.[h|cc]:
+	* glom/variablesmap.cc: Use only non-deprecated ComobBox API.
+
 2010-01-27  Murray Cumming  <murrayc murrayc com>
 
 	Replaced GtkRuler with GimpRuler because GtkRuler was removed from GTK 3.
diff --git a/glom/mode_data/datawidget/comboentry.cc b/glom/mode_data/datawidget/comboentry.cc
index 1db6336..804e865 100644
--- a/glom/mode_data/datawidget/comboentry.cc
+++ b/glom/mode_data/datawidget/comboentry.cc
@@ -74,7 +74,7 @@ void ComboEntry::init()
 {
 #ifndef GLOM_ENABLE_MAEMO
   set_model(m_refModel);
-  set_text_column(m_Columns.m_col_first);
+  set_entry_text_column(m_Columns.m_col_first);
 #else
   //Maemo:
   set_selector(m_maemo_selector);
diff --git a/glom/mode_design/comboentry_currency.cc b/glom/mode_design/comboentry_currency.cc
index e0677c9..f34b349 100644
--- a/glom/mode_design/comboentry_currency.cc
+++ b/glom/mode_design/comboentry_currency.cc
@@ -42,7 +42,7 @@ ComboEntry_Currency::ComboEntry_Currency(BaseObjectType* cobject, const Glib::Re
   }
 
   set_model(m_model);
-  set_text_column(m_model_columns.m_symbol);
+  set_entry_text_column(m_model_columns.m_symbol);
 
   //Show this too.
   pack_start(m_model_columns.m_name);
diff --git a/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc
index a6cd0c4..c97431c 100644
--- a/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc
@@ -42,7 +42,7 @@ ComboEntry_BorderWidth::ComboEntry_BorderWidth(BaseObjectType* cobject, const Gl
   (*iter)[m_model_columns.m_value] = string_for_number(1.0);
 
   set_model(m_model);
-  set_text_column(m_model_columns.m_value);
+  set_entry_text_column(m_model_columns.m_value);
 }
 
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h
index be3cf5e..b727c23 100644
--- a/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h
+++ b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_HH
 #define GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_HH
 
-#include <gtkmm/comboboxentry.h>
+#include <gtkmm/combobox.h>
 #include <gtkmm/builder.h>
 
 #include <gtkmm/liststore.h>
diff --git a/glom/variablesmap.cc b/glom/variablesmap.cc
index dbc2711..34d148c 100644
--- a/glom/variablesmap.cc
+++ b/glom/variablesmap.cc
@@ -22,7 +22,7 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/calendar.h>
 #include <gtkmm/scale.h>
-#include <gtkmm/comboboxentry.h>
+#include <gtkmm/combobox.h>
 
 namespace Glom
 {