Apply a patch by Murray to improve comboboxentry docs

diff --git a/ChangeLog b/ChangeLog
index af86e39c453c1ca7399144ce6b411559e86bc711..1ccabd795ac008f800442ffcf0abbac4e95fcc42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-10  Murray Cumming  <murrayc@murrayc.com>
+
+        * docs/reference/gtk/tmpl/gtkcomboboxentry.sgml: Mention that 
+        the changed signal is emitted when typing - not just when 
+        selecting from the list. Suggest use of GtkEntry::action to 
+        detect end of typing.
+        * gtk/gtkcombobox.c: (gtk_combo_box_class_init): changed signal 
+        documentation: Mention that the GtkComboBoxEntry emits it when 
+        the users types, not just when he selects from the list.
+
 2006-02-10  Murray Cumming  <murrayc@murrayc.com
 
        * gtk/gtkassistant.h: Correct the declaration of the prepare 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index af86e39c453c1ca7399144ce6b411559e86bc711..1ccabd795ac008f800442ffcf0abbac4e95fcc42 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2006-02-10  Murray Cumming  <murrayc@murrayc.com>
+
+        * docs/reference/gtk/tmpl/gtkcomboboxentry.sgml: Mention that 
+        the changed signal is emitted when typing - not just when 
+        selecting from the list. Suggest use of GtkEntry::action to 
+        detect end of typing.
+        * gtk/gtkcombobox.c: (gtk_combo_box_class_init): changed signal 
+        documentation: Mention that the GtkComboBoxEntry emits it when 
+        the users types, not just when he selects from the list.
+
 2006-02-10  Murray Cumming  <murrayc@murrayc.com
 
        * gtk/gtkassistant.h: Correct the declaration of the prepare 

diff --git a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
index 0c68c459537a51bf933540bf62ad57c0beb899af..781209d8f3e139c9e00a276d01bd7b82d876ae8c 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
+++ b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
@@ -19,6 +19,15 @@ and the entry will show the content of the text column in the selected row.  To
 get the text from the entry, use gtk_combo_box_get_active_text().
 </para>
 
+<para>The changed signal will be emitted while typing into a GtkComboBoxEntry, 
+as well as when selecting an item from the GtkComboBoxEntry's list. Use 
+gtk_combo_box_get_active() or gtk_combo_box_get_active_iter() to discover 
+whether an item was actually selected from the list.
+</para>
+
+<para>Connect to the activate signal of the GtkEntry (use gtk_bin_get_child()) to 
+detect when the user actually finishes entering text.</para>
+
 <para>
 The convenience API to construct simple text-only #GtkComboBox<!-- -->es can
 also be used with #GtkComboBoxEntry<!-- -->s which have been constructed

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 7a96131d72f6c86d2ba9fc1e4b12cd6743747e77..a42f1fc0c85aa4bc86d883e726103fec43754bfb 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -534,10 +534,12 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * GtkComboBox::changed:
    * @widget: the object which received the signal
    * 
-   * The changed signal gets emitted when the active
+   * The changed signal is emitted when the active
    * item is changed. The can be due to the user selecting
    * a different item from the list, or due to a 
    * call to gtk_combo_box_set_active_iter().
+   * It will also be emitted while typing into a GtkComboBoxEntry, 
+   * as well as when selecting an item from the GtkComboBoxEntry's list.
    *
    * Since: 2.4
    */