[gtkmm] ComboBox: Added set_entry_text_column(TreeModelColumnBase)

[Murray Cumming <murrayc src gnome org>]

commit c9b697c95306537a7e29b686a1d49ce04e259962
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 14 13:46:34 2010 +0200

    ComboBox: Added set_entry_text_column(TreeModelColumnBase)
    
    * gtk/src/combobox.hg: Added set_entry_text_column(TreeModelColumnBase) to
      match the old GtkComboBoxEntry::set_text_column(TreeModelColumnBase).

 ChangeLog           |   29 +++++++----------------------
 gtk/src/combobox.hg |    3 +++
 2 files changed, 10 insertions(+), 22 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dd5873d..369b230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
-<<<<<<< HEAD
-=======
+2010-10-14  Murray Cumming  <murrayc murrayc com>
+
+	ComboBox: Added set_entry_text_column(TreeModelColumnBase)
+
+	* gtk/src/combobox.hg: Added set_entry_text_column(TreeModelColumnBase) to
+  match the old GtkComboBoxEntry::set_text_column(TreeModelColumnBase).
+
 2010-10-14  Murray Cumming  <murrayc murrayc com>
 
 	ComboBox: Added get_entry() and get_entry_text().
@@ -9,26 +14,6 @@
   dynamic_cast<>. Added get_entry_text(), wrappping get_active_text(), which
   was previously only in ComboBoxEntry.
 
-2010-10-11  Murray Cumming  <murrayc murrayc com>
-
-	SpreadTable: Add get_child_line().
-
-	* gtk/src/gtk_methods.defs: Added the generated part for the new function.
-	* gtk/src/spreadtable.hg: Added get_child_line().
-
-2010-10-08  Murray Cumming  <murrayc murrayc com>
-
-	Add SpreadTable
-
-	* tools/extra_defs_gen/generate_defs_gtk.cc: Use GTK_SPREAD_TABLE.
-  * gtk/src/gtk_signas.defs: Add the generated GtkSpreadTable parts.
-
-	* gtk/src/gtk_methods.defs: Added parts for GtkSpreadTable, from h2defs.py.
-	* gtk/gtkmm.h: Include gtkmm/spreadtable.h.
-  * gtk/src/spreadtable.[hg|ccg]: New files, wrapping GtkSpreadTable.
-	* gtk/src/filelist.am: Mention the new files.
-
->>>>>>> 18f0632... ComboBox: Added get_entry() and get_entry_text().
 2010-10-14  Murray Cumming  <murrayc murrayc com>
 
 	Move resize_grip methods from Statusbar to Window.
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 47bcdc0..1518bc8 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -154,7 +154,10 @@ public:
 
 
   _WRAP_METHOD(bool get_has_entry() const, gtk_combo_box_get_has_entry)
+
+  _WRAP_METHOD(void set_entry_text_column(const TreeModelColumnBase& text_column) const, gtk_combo_box_set_entry_text_column)
   _WRAP_METHOD(void set_entry_text_column(int text_column), gtk_combo_box_set_entry_text_column)
+
   _WRAP_METHOD(int get_entry_text_column() const, gtk_combo_box_get_entry_text_column)
 
   _WRAP_METHOD(void popup(), gtk_combo_box_popup)