summaryrefslogtreecommitdiff
path: root/gtk/deprecated
diff options
context:
space:
mode:
authorChristoph Reiter <creiter@src.gnome.org>2015-10-31 13:38:24 +0100
committerChristoph Reiter <creiter@src.gnome.org>2016-01-04 11:56:44 +0100
commitf66191346c997e9f45843f6d8f087aa555bde811 (patch)
treeaeea0cb8d7b1ed48c04ac9d16d670f53c3064892 /gtk/deprecated
parent10f71dd98c2ef007b25de597b2523870e22fd594 (diff)
downloadgtk+-f66191346c997e9f45843f6d8f087aa555bde811.tar.gz
Mention GtkIconSize in all docs where the argument/return is annotated as taking an int instead of GtkIconSize
In https://bugzilla.gnome.org/show_bug.cgi?id=601425 the annotations were changed to int as they not only take the predefined enum values but also user defined values registered through gtk_icon_size_register() As a result the typelib doesn't contain any information about GtkIconSize for those arguments and the Python docstring only shows the corresponding Python type "int". This changes the argument docs to mention the type explicitly so the Python doc generator can add a link to Gtk.IconSize which contains the most useful predefined values. https://bugzilla.gnome.org/show_bug.cgi?id=757411
Diffstat (limited to 'gtk/deprecated')
-rw-r--r--gtk/deprecated/gtkaction.c3
-rw-r--r--gtk/deprecated/gtkiconfactory.c22
-rw-r--r--gtk/deprecated/gtkstyle.c8
3 files changed, 17 insertions, 16 deletions
diff --git a/gtk/deprecated/gtkaction.c b/gtk/deprecated/gtkaction.c
index 03ed26e02c..e857ab4ed4 100644
--- a/gtk/deprecated/gtkaction.c
+++ b/gtk/deprecated/gtkaction.c
@@ -988,7 +988,8 @@ gtk_action_unblock_activate (GtkAction *action)
/**
* gtk_action_create_icon:
* @action: the action object
- * @icon_size: (type int): the size of the icon that should be created.
+ * @icon_size: (type int): the size of the icon (#GtkIconSize) that should
+ * be created.
*
* This function is intended for use by action implementations to
* create icons displayed in the proxy widgets.
diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
index c1fc37072c..5ac19ca1a0 100644
--- a/gtk/deprecated/gtkiconfactory.c
+++ b/gtk/deprecated/gtkiconfactory.c
@@ -746,7 +746,7 @@ icon_size_lookup_intern (GtkIconSize size,
* gtk_icon_size_lookup_for_settings:
* @settings: a #GtkSettings object, used to determine
* which set of user preferences to used.
- * @size: (type int): an icon size
+ * @size: (type int): an icon size (#GtkIconSize)
* @width: (out) (allow-none): location to store icon width
* @height: (out) (allow-none): location to store icon height
*
@@ -780,7 +780,7 @@ gtk_icon_size_lookup_for_settings (GtkSettings *settings,
/**
* gtk_icon_size_lookup:
- * @size: (type int): an icon size
+ * @size: (type int): an icon size (#GtkIconSize)
* @width: (out) (allow-none): location to store icon width
* @height: (out) (allow-none): location to store icon height
*
@@ -859,7 +859,7 @@ icon_size_register_intern (const gchar *name,
* Registers a new icon size, along the same lines as #GTK_ICON_SIZE_MENU,
* etc. Returns the integer value for the size.
*
- * Returns: (type int): integer value representing the size
+ * Returns: (type int): integer value representing the size (#GtkIconSize)
*
* Deprecated: 3.10: Use #GtkIconTheme instead.
*/
@@ -878,7 +878,7 @@ gtk_icon_size_register (const gchar *name,
/**
* gtk_icon_size_register_alias:
* @alias: an alias for @target
- * @target: (type int): an existing icon size
+ * @target: (type int): an existing icon size (#GtkIconSize)
*
* Registers @alias as another name for @target.
* So calling gtk_icon_size_from_name() with @alias as argument
@@ -927,7 +927,7 @@ gtk_icon_size_register_alias (const gchar *alias,
*
* Looks up the icon size associated with @name.
*
- * Returns: (type int): the icon size
+ * Returns: (type int): the icon size (#GtkIconSize)
*
* Deprecated: 3.10: Use #GtkIconTheme instead.
*/
@@ -1477,7 +1477,7 @@ gtk_icon_set_render_icon_pixbuf_for_scale (GtkIconSet *icon_set,
* gtk_icon_set_render_icon_pixbuf:
* @icon_set: a #GtkIconSet
* @context: a #GtkStyleContext
- * @size: (type int): icon size. A size of (GtkIconSize)-1
+ * @size: (type int): icon size (#GtkIconSize). A size of `(GtkIconSize)-1`
* means render at the size of the source and don’t scale.
*
* Renders an icon using gtk_render_icon_pixbuf(). In most cases,
@@ -1514,7 +1514,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS;
* gtk_icon_set_render_icon_surface:
* @icon_set: a #GtkIconSet
* @context: a #GtkStyleContext
- * @size: (type int): icon size. A size of (GtkIconSize)-1
+ * @size: (type int): icon size (#GtkIconSize). A size of `(GtkIconSize)-1`
* means render at the size of the source and don’t scale.
* @scale: the window scale to render for
* @for_window: (allow-none): #GdkWindow to optimize drawing for, or %NULL
@@ -1562,7 +1562,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS;
* @style: (allow-none): a #GtkStyle associated with @widget, or %NULL
* @direction: text direction
* @state: widget state
- * @size: (type int): icon size. A size of (GtkIconSize)-1
+ * @size: (type int): icon size (#GtkIconSize). A size of `(GtkIconSize)-1`
* means render at the size of the source and don’t scale.
* @widget: (allow-none): widget that will display the icon, or %NULL.
* The only use that is typically made of this
@@ -1724,7 +1724,7 @@ gtk_icon_set_add_source (GtkIconSet *icon_set,
* gtk_icon_set_get_sizes:
* @icon_set: a #GtkIconSet
* @sizes: (array length=n_sizes) (out) (type int): return location
- * for array of sizes
+ * for array of sizes (#GtkIconSize)
* @n_sizes: location to store number of elements in returned array
*
* Obtains a list of icon sizes this icon set can render. The returned
@@ -2310,7 +2310,7 @@ gtk_icon_source_set_state (GtkIconSource *source,
/**
* gtk_icon_source_set_size:
* @source: a #GtkIconSource
- * @size: (type int): icon size this source applies to
+ * @size: (type int): icon size (#GtkIconSize) this source applies to
*
* Sets the icon size this icon source is intended to be used
* with.
@@ -2378,7 +2378,7 @@ gtk_icon_source_get_state (const GtkIconSource *source)
* Obtains the icon size this source applies to. The return value
* is only useful/meaningful if the icon size is not wildcarded.
*
- * Returns: (type int): icon size this source matches.
+ * Returns: (type int): icon size (#GtkIconSize) this source matches.
*
* Deprecated: 3.10: Use #GtkIconTheme instead.
*/
diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
index 2cad590d26..664330d54a 100644
--- a/gtk/deprecated/gtkstyle.c
+++ b/gtk/deprecated/gtkstyle.c
@@ -1289,8 +1289,8 @@ gtk_style_real_set_background (GtkStyle *style,
* @source: the #GtkIconSource specifying the icon to render
* @direction: a text direction
* @state: a state
- * @size: (type int): the size to render the icon at. A size of
- * (GtkIconSize)-1 means render at the size of the source and
+ * @size: (type int): the size to render the icon at (#GtkIconSize). A size of
+ * `(GtkIconSize)-1` means render at the size of the source and
* don’t scale.
* @widget: (allow-none): the widget
* @detail: (allow-none): a style detail
@@ -4736,8 +4736,8 @@ gtk_widget_class_path (GtkWidget *widget,
* gtk_widget_render_icon:
* @widget: a #GtkWidget
* @stock_id: a stock ID
- * @size: (type int): a stock size. A size of (GtkIconSize)-1 means
- * render at the size of the source and don’t scale (if there are
+ * @size: (type int): a stock size (#GtkIconSize). A size of `(GtkIconSize)-1`
+ * means render at the size of the source and don’t scale (if there are
* multiple source sizes, GTK+ picks one of the available sizes).
* @detail: (allow-none): render detail to pass to theme engine
*