Add deprecation notes pointing people to GtkComboBox.

This commit is contained in:
Matthias Clasen
2004-02-15 21:06:53 +00:00
parent f1f20e7e0c
commit d7042395c4
9 changed files with 57 additions and 22 deletions

View File

@ -1,3 +1,8 @@
Sun Feb 15 22:08:53 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add
deprecation note pointing people to GtkComboBox.
Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreednd.c: * gtk/gtktreednd.c:

View File

@ -1,3 +1,8 @@
Sun Feb 15 22:08:53 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add
deprecation note pointing people to GtkComboBox.
Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreednd.c: * gtk/gtktreednd.c:

View File

@ -1,3 +1,8 @@
Sun Feb 15 22:08:53 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add
deprecation note pointing people to GtkComboBox.
Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreednd.c: * gtk/gtktreednd.c:

View File

@ -1,3 +1,8 @@
Sun Feb 15 22:08:53 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add
deprecation note pointing people to GtkComboBox.
Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreednd.c: * gtk/gtktreednd.c:

View File

@ -1,3 +1,8 @@
Sun Feb 15 22:08:53 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Add
deprecation note pointing people to GtkComboBox.
Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 15 02:49:45 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreednd.c: * gtk/gtktreednd.c:

View File

@ -1,3 +1,9 @@
Sun Feb 15 22:09:53 2004 Matthias Clasen <maclas@gmx.de>
* gtk/tmpl/gtkcombo.sgml:
* gtk/tmpl/gtkoptionmenu.sgml: Add deprecation notes pointing
people to GtkComboBox.
Sun Feb 15 02:46:53 2004 Matthias Clasen <maclas@gmx.de> Sun Feb 15 02:46:53 2004 Matthias Clasen <maclas@gmx.de>
* gtk/tmpl/gtktreednd.sgml: Add docs. * gtk/tmpl/gtktreednd.sgml: Add docs.

View File

@ -23,6 +23,9 @@ By default, the user can step through the items in the list using the
arrow (cursor) keys, though this behaviour can be turned off with arrow (cursor) keys, though this behaviour can be turned off with
gtk_combo_set_use_arrows(). gtk_combo_set_use_arrows().
</para> </para>
<para>
As of GTK+ 2.4, #GtkCombo has been deprecated in favor of #GtkComboBox.
</para>
<example id="gtkcombo-simple-example"> <example id="gtkcombo-simple-example">
<title>Creating a <structname>GtkCombo</structname> widget with simple text <title>Creating a <structname>GtkCombo</structname> widget with simple text
@ -85,26 +88,10 @@ items.</title>
The #GtkFixedChild-struct struct contains the following fields. The #GtkFixedChild-struct struct contains the following fields.
(These fields should be considered read-only. They should never be set by (These fields should be considered read-only. They should never be set by
an application.) an application.)
<informaltable pgwide="1" frame="none" role="struct">
<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
<tbody>
<row>
<entry>#GtkWidget *entry;</entry>
<entry>the text entry field.</entry>
</row>
<row>
<entry>#GtkWidget *list;</entry>
<entry>the list shown in the drop-down window.</entry>
</row>
</tbody></tgroup></informaltable>
</para> </para>
@entry: @entry: the text entry field.
@list: @list: the list shown in the drop-down window.
<!-- ##### ARG GtkCombo:allow-empty ##### --> <!-- ##### ARG GtkCombo:allow-empty ##### -->
<para> <para>
@ -137,6 +124,7 @@ Creates a new #GtkCombo.
</para> </para>
@Returns: a new #GtkCombo. @Returns: a new #GtkCombo.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_combo_set_popdown_strings ##### --> <!-- ##### FUNCTION gtk_combo_set_popdown_strings ##### -->
@ -147,6 +135,7 @@ Convenience function to set all of the items in the popup list.
@combo: a #GtkCombo. @combo: a #GtkCombo.
@strings: a list of strings, or %NULL to clear the popup list @strings: a list of strings, or %NULL to clear the popup list
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_combo_set_value_in_list ##### --> <!-- ##### FUNCTION gtk_combo_set_value_in_list ##### -->
@ -162,6 +151,7 @@ If an empty field is acceptable, the @ok_if_empty parameter should be %TRUE.
@combo: a #GtkCombo. @combo: a #GtkCombo.
@val: %TRUE if the value entered must match one of the values in the list. @val: %TRUE if the value entered must match one of the values in the list.
@ok_if_empty: %TRUE if an empty value is considered valid. @ok_if_empty: %TRUE if an empty value is considered valid.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_combo_set_use_arrows ##### --> <!-- ##### FUNCTION gtk_combo_set_use_arrows ##### -->
@ -171,7 +161,9 @@ the list. This is on by default.
</para> </para>
@combo: a #GtkCombo. @combo: a #GtkCombo.
@val: %TRUE if the arrow keys can be used to step through the items in the list. @val: %TRUE if the arrow keys can be used to step through the items in
the list.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_combo_set_use_arrows_always ##### --> <!-- ##### FUNCTION gtk_combo_set_use_arrows_always ##### -->
@ -181,6 +173,7 @@ Obsolete function, does nothing.
@combo: a #GtkCombo. @combo: a #GtkCombo.
@val: unused @val: unused
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_combo_set_case_sensitive ##### --> <!-- ##### FUNCTION gtk_combo_set_case_sensitive ##### -->
@ -196,6 +189,7 @@ worried about differences in case.
@combo: a #GtkCombo. @combo: a #GtkCombo.
@val: %TRUE if the text in the list items is case sensitive. @val: %TRUE if the text in the list items is case sensitive.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_combo_set_item_string ##### --> <!-- ##### FUNCTION gtk_combo_set_item_string ##### -->
@ -207,6 +201,7 @@ selected. This is needed if the list item is not a simple label.
@combo: a #GtkCombo. @combo: a #GtkCombo.
@item: a #GtkItem. @item: a #GtkItem.
@item_value: the string to place in the #GtkEntry when @item is selected. @item_value: the string to place in the #GtkEntry when @item is selected.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_combo_disable_activate ##### --> <!-- ##### FUNCTION gtk_combo_disable_activate ##### -->
@ -218,5 +213,6 @@ instead.
</para> </para>
@combo: a #GtkCombo. @combo: a #GtkCombo.
@Deprecated: Use #GtkComboBox instead.

View File

@ -22,6 +22,10 @@ the option menu; in the "changed" signal, check the new selected
menu item with gtk_option_menu_get_history(). menu item with gtk_option_menu_get_history().
</para> </para>
<para>
As of GTK+ 2.4, #GtkOptionMenu has been deprecated in favor of #GtkComboBox.
</para>
<!-- ##### SECTION See_Also ##### --> <!-- ##### SECTION See_Also ##### -->
@ -60,7 +64,7 @@ Creates a new #GtkOptionMenu.
</para> </para>
@Returns: a new #GtkOptionMenu. @Returns: a new #GtkOptionMenu.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_option_menu_get_menu ##### --> <!-- ##### FUNCTION gtk_option_menu_get_menu ##### -->
<para> <para>
@ -69,6 +73,7 @@ Returns the #GtkMenu associated with the #GtkOptionMenu.
@option_menu: a #GtkOptionMenu. @option_menu: a #GtkOptionMenu.
@Returns: the #GtkMenu associated with the #GtkOptionMenu. @Returns: the #GtkMenu associated with the #GtkOptionMenu.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_option_menu_set_menu ##### --> <!-- ##### FUNCTION gtk_option_menu_set_menu ##### -->
@ -80,6 +85,7 @@ use of tearoff menu items, submenus, and accelerators.
@option_menu: a #GtkOptionMenu. @option_menu: a #GtkOptionMenu.
@menu: the #GtkMenu to associate with the #GtkOptionMenu. @menu: the #GtkMenu to associate with the #GtkOptionMenu.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_option_menu_remove_menu ##### --> <!-- ##### FUNCTION gtk_option_menu_remove_menu ##### -->
@ -88,6 +94,7 @@ Removes the menu from the option menu.
</para> </para>
@option_menu: a #GtkOptionMenu. @option_menu: a #GtkOptionMenu.
@Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_option_menu_set_history ##### --> <!-- ##### FUNCTION gtk_option_menu_set_history ##### -->
@ -97,8 +104,8 @@ selected value for the option menu.
</para> </para>
@option_menu: a #GtkOptionMenu. @option_menu: a #GtkOptionMenu.
@index_: the index of the menu item to select. Index values are from @index_: the index of the menu item to select. Index values are from 0 to n-1.
0 to n-1. @Deprecated: Use #GtkComboBox instead.
<!-- ##### FUNCTION gtk_option_menu_get_history ##### --> <!-- ##### FUNCTION gtk_option_menu_get_history ##### -->

View File

@ -337,6 +337,7 @@ gtk_option_menu_set_history (GtkOptionMenu *option_menu,
* items are numbered from top to bottom, starting with 0. * items are numbered from top to bottom, starting with 0.
* *
* Return value: index of the selected menu item, or -1 if there are no menu items * Return value: index of the selected menu item, or -1 if there are no menu items
* Deprecated: Use #GtkComboBox instead.
**/ **/
gint gint
gtk_option_menu_get_history (GtkOptionMenu *option_menu) gtk_option_menu_get_history (GtkOptionMenu *option_menu)