[gtkmm/spread-table: 3/3] Fix merge

[Murray Cumming <murrayc src gnome org>]

commit 9c0e216f23c16367dffc114f431151b1a360a0f1
Merge: 18f0632 c9b697c
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 14 14:02:27 2010 +0200

    Fix merge

 ChangeLog           |   25 ++++++++++++++++---------
 gtk/src/combobox.hg |    3 +++
 2 files changed, 19 insertions(+), 9 deletions(-)
---
diff --cc ChangeLog
index 29640b3,369b230..03a508e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,33 -1,21 +1,40 @@@
- 2010-10-14  Murray Cumming  <murrayc murrayc com>
- 
- 	ComboBox: Added get_entry() and get_entry_text().
- 
- 	* gtk/src/combobox.[hg|ccg]: Added our custom get_entry() method that was
-   previously in ComboBoxEntry. It avoids the need to call get_child() and
-   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.
 +
  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().
+ 
+ 	* gtk/src/combobox.[hg|ccg]: Added our custom get_entry() method that was
+   previously in ComboBoxEntry. It avoids the need to call get_child() and
+   dynamic_cast<>. Added get_entry_text(), wrappping get_active_text(), which
+   was previously only in ComboBoxEntry.
+ 
+ 2010-10-14  Murray Cumming  <murrayc murrayc com>
+ 
  	Move resize_grip methods from Statusbar to Window.
  
  	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.