[gtkmm] ComboBoxText: Documentation: Correct the overview

[Murray Cumming <murrayc src gnome org>]

commit d5674d69dc3770483760a55abe7d36d90ae9e270
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Jan 15 00:01:00 2011 +0100

    ComboBoxText: Documentation: Correct the overview
    
    * gtk/src/combobox.hg: Update the overview comment now that the documentation
    for the C API has been improved. This removes the mention of OptionMenu,
    mention has-entry, and talks more about ComboBoxEntry.
    
    This was mentioned in bug #619656 by Kjell Ahlstedt.

 ChangeLog           |   10 ++++++++++
 gtk/src/combobox.hg |   13 ++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6e4d639..dff9361 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-14  Murray Cumming  <murrayc murrayc com>
 
+	ComboBoxText: Documentation: Correct the overview
+
+	* gtk/src/combobox.hg: Update the overview comment now that the documentation 
+	for the C API has been improved. This removes the mention of OptionMenu, 
+	mention has-entry, and talks more about ComboBoxEntry.
+	
+	This was mentioned in bug #619656 by Kjell Ahlstedt.
+
+2011-01-14  Murray Cumming  <murrayc murrayc com>
+
 	ComboBoxText: Documentation: Correct the overview.
 
 	* gtk/src/comboboxtext.hg: Mention append(), etc, instead of 
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 3e2d925..d2f060d 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -39,7 +39,7 @@ namespace Gtk
  * A ComboBox is a widget that allows the user to choose from a list of valid choices. The ComboBox displays the
  * selected choice. When activated, the ComboBox displays a popup which allows the user to make a new choice. The
  * style in which the selected value is displayed, and the style of the popup is determined by the current theme.
- * It may be similar to a OptionMenu, or similar to a Windows-style combo box.
+ * It may be similar to a Windows-style combo box.
  *
  * The ComboBox uses the model-view pattern; the list of valid choices is specified in the form of a tree model,
  * and the display of the choices can be adapted to the data in the model by using cell renderers, as you would in
@@ -47,11 +47,18 @@ namespace Gtk
  * valid choices is not restricted to a flat list, it can be a real tree, and the popup will reflect the tree
  * structure.
  *
+ * To allow the user to enter values not in the model, the 'has-entry'
+ * property allows the ComboBox to contain a Gtk::Entry. This entry
+ * can be accessed by calling Gtk::Bin::get_child() on the combo box.
+ *
+ * For a simple list of textual choices, the model-view API of ComboBox
+ * can be a bit overwhelming. In this case, ComboBoxText offers a
+ * simple alternative. Both ComboBox and ComboBoxText can contain
+ * an entry.
+ *
  * The ComboBox widget looks like this:
  * @image html combobox1.png
  *
- * See also ComboBoxText, which is specialised for a single text column.
- *
  * @ingroup Widgets
  */
 class ComboBox