From f2685563acc9833f043175c138702b62564b91f1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 20 Dec 2005 05:47:43 +0000 Subject: Updates --- docs/reference/ChangeLog | 6 +- docs/reference/gdk/tmpl/threads.sgml | 6 +- docs/reference/gtk/tmpl/gtkcombo.sgml | 18 +++--- docs/reference/gtk/tmpl/gtkcombobox.sgml | 37 ++++++++++++ docs/reference/gtk/tmpl/gtkfilechooser.sgml | 1 + docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml | 23 ++++++++ docs/reference/gtk/tmpl/gtkmain.sgml | 40 ++++++------- docs/reference/gtk/tmpl/gtkmenu.sgml | 5 ++ docs/reference/gtk/tmpl/gtknotebook.sgml | 5 ++ docs/reference/gtk/tmpl/gtkobject.sgml | 10 +--- docs/reference/gtk/tmpl/gtkoptionmenu.sgml | 12 ++-- docs/reference/gtk/tmpl/gtkrange.sgml | 10 ++++ docs/reference/gtk/tmpl/gtksettings.sgml | 35 ++++++++++++ docs/reference/gtk/tmpl/gtkstatusicon.sgml | 70 +++++++++++++++++++++++ docs/reference/gtk/tmpl/gtkstyle.sgml | 11 ++++ docs/reference/gtk/tmpl/gtktextbuffer.sgml | 14 +++++ docs/reference/gtk/tmpl/gtktexttag.sgml | 1 + docs/reference/gtk/tmpl/gtktoggleaction.sgml | 5 ++ docs/reference/gtk/tmpl/gtktreeview.sgml | 9 +++ 19 files changed, 270 insertions(+), 48 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 8e61f43527..9bf4a1d812 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,9 @@ -2005-12-19 Matthias Clasen +2005-12-20 Matthias Clasen + + * gtk/tmpl/gtkcombo.sgml: Small additions +2005-12-19 Matthias Clasen + * gdk-pixbuf/tmpl/module_interface.sgml: * gdk-pixbuf/gdk-pixbuf-sections.txt: * gdk-pixbuf/tmpl/animation.sgml: Small additions/fixes. diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml index 0bb57f5133..c973ef9484 100644 --- a/docs/reference/gdk/tmpl/threads.sgml +++ b/docs/reference/gdk/tmpl/threads.sgml @@ -290,10 +290,12 @@ Leaves a critical region begun with gdk_threads_enter(). The #GMutex used to implement the critical region for -gdk_threads_enter()/gdk_threads_leave(). This variable should not be -used directly — consider it private. +gdk_threads_enter()/gdk_threads_leave(). +@Deprecated: 2.4: This variable should not be used directly + — consider it private. + diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml index 375f2259dc..66813ef34d 100644 --- a/docs/reference/gtk/tmpl/gtkcombo.sgml +++ b/docs/reference/gtk/tmpl/gtkcombo.sgml @@ -95,7 +95,7 @@ an application.) @entry: the text entry field. @list: the list shown in the drop-down window. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -128,7 +128,7 @@ Creates a new #GtkCombo. @Returns: a new #GtkCombo. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -139,7 +139,7 @@ Convenience function to set all of the items in the popup list. @combo: a #GtkCombo. @strings: a list of strings, or %NULL to clear the popup list -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -155,7 +155,7 @@ If an empty field is acceptable, the @ok_if_empty parameter should be %TRUE. @combo: a #GtkCombo. @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. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -167,7 +167,7 @@ the list. This is on by default. @combo: a #GtkCombo. @val: %TRUE if the arrow keys can be used to step through the items in the list. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -177,7 +177,7 @@ Obsolete function, does nothing. @combo: a #GtkCombo. @val: unused -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -193,7 +193,7 @@ worried about differences in case. @combo: a #GtkCombo. @val: %TRUE if the text in the list items is case sensitive. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -205,7 +205,7 @@ selected. This is needed if the list item is not a simple label. @combo: a #GtkCombo. @item: a #GtkItem. @item_value: the string to place in the #GtkEntry when @item is selected. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -217,6 +217,6 @@ instead. @combo: a #GtkCombo. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. diff --git a/docs/reference/gtk/tmpl/gtkcombobox.sgml b/docs/reference/gtk/tmpl/gtkcombobox.sgml index b647b7109d..06d1af6c27 100644 --- a/docs/reference/gtk/tmpl/gtkcombobox.sgml +++ b/docs/reference/gtk/tmpl/gtkcombobox.sgml @@ -55,6 +55,20 @@ gtk_combo_box_get_active_text(). @combobox: the object which received the signal. + + + + + +@combobox: the object which received the signal. + + + + + + +@combobox: the object which received the signal. + @@ -90,6 +104,11 @@ gtk_combo_box_get_active_text(). + + + + + @@ -347,6 +366,24 @@ gtk_combo_box_get_active_text(). @Returns: + + + + + +@combo_box: +@title: + + + + + + + +@combo_box: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkfilechooser.sgml b/docs/reference/gtk/tmpl/gtkfilechooser.sgml index 93df72ab1c..bf391b30a5 100644 --- a/docs/reference/gtk/tmpl/gtkfilechooser.sgml +++ b/docs/reference/gtk/tmpl/gtkfilechooser.sgml @@ -773,6 +773,7 @@ gtk_widget_destroy (chooser); @GTK_FILE_CHOOSER_ERROR_NONEXISTENT: Indicates that a file does not exist. @GTK_FILE_CHOOSER_ERROR_BAD_FILENAME: Indicates a malformed filename. +@GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS: diff --git a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml index 476763e8c6..10071b4cdf 100644 --- a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml @@ -62,6 +62,11 @@ This should not be accessed directly. Use the accessor functions below. + + + + + @@ -138,3 +143,21 @@ This should not be accessed directly. Use the accessor functions below. @n_chars: + + + + + +@button: +@Returns: + + + + + + + +@button: +@focus_on_click: + + diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml index c45bf6cca5..5ea887705c 100644 --- a/docs/reference/gtk/tmpl/gtkmain.sgml +++ b/docs/reference/gtk/tmpl/gtkmain.sgml @@ -492,7 +492,7 @@ point the timeout is destroyed and will not be called again. @data: The data to pass to the function. @destroy: Function to call when the timeout is destroyed or %NULL. @Returns: A unique id for the event source. -@Deprecated: Use g_timeout_add_full() instead. +@Deprecated: 2.4: Use g_timeout_add_full() instead. @@ -507,7 +507,7 @@ point the timeout is destroyed and will not be called again. @function: The function to call periodically. @data: The data to pass to the function. @Returns: A unique id for the event source. -@Deprecated: Use g_timeout_add() instead. +@Deprecated: 2.4: Use g_timeout_add() instead. @@ -516,7 +516,7 @@ Removes the given timeout destroying all information about it. @timeout_handler_id: The identifier returned when installing the timeout. -@Deprecated: Use g_source_remove() instead. +@Deprecated: 2.4: Use g_source_remove() instead. @@ -529,7 +529,7 @@ higher priority are to be processed. The default priority is @function: The function to call. @data: The information to pass to the function. @Returns: a unique handle for this registration. -@Deprecated: Use g_idle_add() instead. +@Deprecated: 2.4: Use g_idle_add() instead. @@ -545,7 +545,7 @@ Note that you will interfere with GTK+ if you use a priority above @function: The function to call. @data: Data to pass to that function. @Returns: A unique id for the event source. -@Deprecated: Use g_idle_add_full() instead. +@Deprecated: 2.4: Use g_idle_add_full() instead. @@ -563,7 +563,7 @@ Note that you will interfere with GTK+ if you use a priority above @data: Data to pass to that function. @destroy: Function to call when the timeout is destroyed or %NULL. @Returns: A unique id for the event source. -@Deprecated: Use g_idle_add_full() instead. +@Deprecated: 2.4: Use g_idle_add_full() instead. @@ -572,7 +572,7 @@ Removes the idle function with the given id. @idle_handler_id: Identifies the idle function to remove. -@Deprecated: Use g_source_remove() instead. +@Deprecated: 2.4: Use g_source_remove() instead. @@ -581,7 +581,7 @@ Removes the idle function identified by the user data. @data: remove the idle function which was registered with this user data. -@Deprecated: Use g_idle_remove_by_data() instead. +@Deprecated: 2.4: Use g_idle_remove_by_data() instead. @@ -598,7 +598,7 @@ on a file descriptor. @destroy: callback function to call with @data when the input handler is removed, or %NULL. @Returns: A unique id for the event source; to be used with gtk_input_remove(). -@Deprecated: Use g_io_add_watch_full() instead. +@Deprecated: 2.4: Use g_io_add_watch_full() instead. @@ -607,7 +607,7 @@ Removes the function with the given id. @input_handler_id: Identifies the function to remove. -@Deprecated: Use g_source_remove() instead. +@Deprecated: 2.4: Use g_source_remove() instead. @@ -617,9 +617,8 @@ GTK+ to do pending redraws. This priority is lower than %GTK_PRIORITY_RESIZE to avoid redrawing a widget just before resizing (and therefore redrawing it again). - -This macro is deprecated. You should use %GDK_PRIORITY_REDRAW instead. - + +@Deprecated: 2.4: This macro is deprecated. You should use %GDK_PRIORITY_REDRAW instead. @@ -637,11 +636,10 @@ GTK+ to compute the sizes of widgets. This priority is higher than Use this for high priority timeouts. This priority is never used inside GTK+ so everything running at this priority will be running before anything inside the toolkit. - -This macro is deprecated. You should use %G_PRIORITY_HIGH instead. - +@Deprecated: 2.4: This macro is deprecated. You should use %G_PRIORITY_HIGH instead. + @@ -654,21 +652,19 @@ This priority is for GTK+ internal stuff. Don't use it in your applications. Default priority for idle functions. - -This macro is deprecated. You should use %G_PRIORITY_DEFAULT_IDLE instead. - +@Deprecated: 2.4: This macro is deprecated. You should use %G_PRIORITY_DEFAULT_IDLE instead. + Priority for very unimportant background tasks. - -This macro is deprecated. You should use %G_PRIORITY_LOW instead. - +@Deprecated: 2.4: This macro is deprecated. You should use %G_PRIORITY_LOW instead. + diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index 4c5f02a716..fd7570a2a0 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -129,6 +129,11 @@ should be accessed using the functions below. + + + + + diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index 9f1d768bce..8f9691c627 100644 --- a/docs/reference/gtk/tmpl/gtknotebook.sgml +++ b/docs/reference/gtk/tmpl/gtknotebook.sgml @@ -99,6 +99,11 @@ Emitted when the user or a function changes the current page. + + + + + diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml index 0a0ac3e5d1..ba13035ad9 100644 --- a/docs/reference/gtk/tmpl/gtkobject.sgml +++ b/docs/reference/gtk/tmpl/gtkobject.sgml @@ -134,12 +134,6 @@ Tells about the state of the object. @GTK_IN_DESTRUCTION: the object is currently being destroyed. This is used internally by GTK+ to prevent reinvokations during destruction. -@GTK_FLOATING: the object is orphaned. Objects that take strong hold of an - object may call g_object_ref_sink(), to convert the floating reference into - a regular one, if they believe they are nearly primary ownership of the - object. -GTK_CONNECTED: signals are connected to this object. -@GTK_RESERVED_1: reserved for future use @GTK_RESERVED_2: reserved for future use @@ -163,7 +157,6 @@ See the overview documentation for #GtkObject. Possible flags indicating how an argument should be treated. -Deprecated in favor of #GParamSpec features. @GTK_ARG_READABLE: the argument is readable. (i.e. can be queried) @@ -175,6 +168,7 @@ set. Hence this flag is not allowed with #GTK_ARG_WRITABLE, and is redundant with #GTK_ARG_CONSTRUCT. @GTK_ARG_CHILD_ARG: an argument type that applies to (and may be different for) each child. Used by #GtkContainer. +@Deprecated: Use corresponding #GParamSpec features instead @@ -201,7 +195,7 @@ the top of the page. @object: the object to sink. -@Deprecated: Use g_object_ref_sink() instead +@Deprecated: 2.10: Use g_object_ref_sink() instead diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index 03ae18506c..3b58a49ca6 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -38,7 +38,7 @@ The #GtkOptionMenu-struct struct contains private data only, and should be accessed using the functions below. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -68,7 +68,7 @@ Creates a new #GtkOptionMenu. @Returns: a new #GtkOptionMenu. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -78,7 +78,7 @@ Returns the #GtkMenu associated with the #GtkOptionMenu. @option_menu: a #GtkOptionMenu. @Returns: the #GtkMenu associated with the #GtkOptionMenu. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -90,7 +90,7 @@ use of tearoff menu items, submenus, and accelerators. @option_menu: a #GtkOptionMenu. @menu: the #GtkMenu to associate with the #GtkOptionMenu. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -99,7 +99,7 @@ Removes the menu from the option menu. @option_menu: a #GtkOptionMenu. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. @@ -110,7 +110,7 @@ selected value for the option menu. @option_menu: a #GtkOptionMenu. @index_: the index of the menu item to select. Index values are from 0 to n-1. -@Deprecated: Use #GtkComboBox instead. +@Deprecated: 2.4: Use #GtkComboBox instead. diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index 9233eb1eb6..2213144e93 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -69,11 +69,21 @@ Emitted when the range value changes. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml index f39524fe90..daaf96eeed 100644 --- a/docs/reference/gtk/tmpl/gtksettings.sgml +++ b/docs/reference/gtk/tmpl/gtksettings.sgml @@ -23,6 +23,11 @@ Sharing settings between applications + + + + + @@ -43,6 +48,11 @@ Sharing settings between applications + + + + + @@ -78,6 +88,11 @@ Sharing settings between applications + + + + + @@ -133,6 +148,16 @@ Sharing settings between applications + + + + + + + + + + @@ -143,6 +168,16 @@ Sharing settings between applications + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkstatusicon.sgml b/docs/reference/gtk/tmpl/gtkstatusicon.sgml index 8aa75bae61..25693a4693 100644 --- a/docs/reference/gtk/tmpl/gtkstatusicon.sgml +++ b/docs/reference/gtk/tmpl/gtkstatusicon.sgml @@ -42,6 +42,76 @@ on Win32 doesn't allow to embed arbitrary widgets. + + + + + + + + + + + +@statusicon: the object which received the signal. + + + + + + +@statusicon: the object which received the signal. +@arg1: +@arg2: + + + + + + +@statusicon: the object which received the signal. +@arg1: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml index a594536440..9c3960faec 100644 --- a/docs/reference/gtk/tmpl/gtkstyle.sgml +++ b/docs/reference/gtk/tmpl/gtkstyle.sgml @@ -162,6 +162,17 @@ Deprecated alias for gtk_style_apply_default_background(). @h: + + + + + +@style: +@color_name: +@color: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml index 75830dfd02..51a0ddf5af 100644 --- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml +++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml @@ -136,6 +136,11 @@ types related to the text widget and how they work together. @arg2: @arg3: + + + + + @@ -463,6 +468,15 @@ types related to the text widget and how they work together. @Returns: + + + + + +@buffer: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index 0cf6f29660..ee5d17f9d9 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -510,5 +510,6 @@ modified directly. @values: +@Returns: diff --git a/docs/reference/gtk/tmpl/gtktoggleaction.sgml b/docs/reference/gtk/tmpl/gtktoggleaction.sgml index 78c706e60f..c6ceec7b55 100644 --- a/docs/reference/gtk/tmpl/gtktoggleaction.sgml +++ b/docs/reference/gtk/tmpl/gtktoggleaction.sgml @@ -32,6 +32,11 @@ private members and should not be accessed directly. @toggleaction: the object which received the signal. + + + + + diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index def070312b..138f3fece6 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -450,6 +450,15 @@ has some similarity to strcmp() returning 0 for equal strings. @tree_view: + + + + + +@tree_view: +@Returns: + + -- cgit v1.2.1