[gtkmm-documentation/gtkmm-2-24] ComboBox: Use set_entry_text_column() instead of set_text_column()

[Murray Cumming <murrayc src gnome org>]

commit 342314a34635864486473598ed3bebc3fa323b25
Author: Kalev Lember <kalev smartlink ee>
Date:   Fri Mar 18 18:03:43 2011 +0200

    ComboBox: Use set_entry_text_column() instead of set_text_column()
    
    * docs/tutorial/C/gtkmm-tutorial-in.xml:
    * examples/book/combobox/entry_complex/examplewindow.cc: Updated the
    files to use set_entry_text_column() instead of set_text_column() which
    was a leftover from ComboBoxEntry's removal.

 ChangeLog                                          |   45 ++++++++++++++++++++
 docs/tutorial/C/gtkmm-tutorial-in.xml              |    5 +-
 .../book/comboboxentry/complex/examplewindow.cc    |    2 +-
 3 files changed, 49 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9e691a0..ca66e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+<<<<<<< HEAD
+=======
+2011-03-18  Kalev Lember <kalev smartlink ee>
+
+    ComboBox: Use set_entry_text_column() instead of set_text_column()
+    
+    * docs/tutorial/C/gtkmm-tutorial-in.xml:
+    * examples/book/combobox/entry_complex/examplewindow.cc: Updated the
+    files to use set_entry_text_column() instead of set_text_column() which
+    was a leftover from ComboBoxEntry's removal.
+
+2011-03-09  Murray Cumming  <murrayc murrayc/cp,>
+
+	Gtk::Application example: open an empty document if none is specified.
+
+	* examples/book/application/exampleapplication.cc: Do not fail if no file
+	was specified.
+
+2011-03-09  Murray Cumming  <murrayc murrayc com>
+
+	Gtk::Builder example: Remove a now non-existent property.
+
+	* examples/book/builder/basic/basic.ui:
+	* examples/book/builder/derived/basic.ui: The glade files mentioned the old
+	GtkDialog::has-separator property which has now been removed. This caused a
+	harmless stderr warning.
+
+2011-03-04  Murray Cumming  <murrayc murrayc com>
+
+	Added Gtk::Application example.
+
+	* examples/Makefile.am:
+	* examples/book/application/: Show how to do command-line parsing.
+
+	There is still a warning at the end which we should deal with:
+	(example:17496): Gtk-CRITICAL **: gtk_main_quit: assertion `main_loops != NULL' failed
+
+2011-02-22  Murray Cumming  <murrayc murrayc com>
+
+	Code-style changes.
+
+	* examples/book/grid/examplewindow.[h|cc]: Slight style changes, for
+	consistency with the other examples.
+
+>>>>>>> 5b59d99... Correct ChangeLog
 2011-02-22  David King  <davidk openismus com>
 
 	Add Gtk::Tooltip example to the tutorial
diff --git a/docs/tutorial/C/gtkmm-tutorial-in.xml b/docs/tutorial/C/gtkmm-tutorial-in.xml
index 018b312..b975395 100644
--- a/docs/tutorial/C/gtkmm-tutorial-in.xml
+++ b/docs/tutorial/C/gtkmm-tutorial-in.xml
@@ -3498,8 +3498,9 @@ You might need to react to every change of selection in the ComboBox, for instan
 
 <sect2 id="sec-comboboxentry-text-column">
 <title>The text column</title>
-<para>Unlike a regular <classname>ComboBox</classname>, a <classname>ComboBoxEntry</classname> contains a <classname>Entry</classname> widget for entering of arbitrary text. So that this Entry can interact with the drop-down list of choices, you must specify which of your model columns are the text column, with <methodname>set_text_column()</methodname>. For instance:
-<programlisting>m_combo.set_text_column(m_columns.m_col_name);</programlisting>
+
+<para>So that the Entry can interact with the drop-down list of choices, you must specify which of your model columns are the text column, with <methodname>set_entry_text_column()</methodname>. For instance:
+<programlisting>m_combo.set_entry_text_column(m_columns.m_col_name);</programlisting>
 </para>
 <para>
 When you select a choice from the drop-down menu, the value from this column will be placed in the <classname>Entry</classname>.
diff --git a/examples/book/comboboxentry/complex/examplewindow.cc b/examples/book/comboboxentry/complex/examplewindow.cc
index 8a491da..e9b18b5 100644
--- a/examples/book/comboboxentry/complex/examplewindow.cc
+++ b/examples/book/comboboxentry/complex/examplewindow.cc
@@ -61,7 +61,7 @@ ExampleWindow::ExampleWindow()
 
   //Add the model columns to the Combo (which is a kind of view),
   //rendering them in the default way:
-  //This is automatically rendered when we use set_text_column().
+  //This is automatically rendered when we use set_entry_text_column().
   //m_Combo.pack_start(m_Columns.m_col_id);
   m_Combo.pack_start(m_Columns.m_col_name);