summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-05-11 22:01:37 -0400
committerMatthias Clasen <mclasen@redhat.com>2014-05-12 07:54:24 -0400
commitc6c2408a8daea5b7831c99d61d5daa154b3ccd76 (patch)
treeef306de16025d9cfcfd80acd4672c9bd92ae7bca
parent67b2f0c9b42ef4a6bfcdc5e93053f4bd3de9499c (diff)
downloadgtk+-c6c2408a8daea5b7831c99d61d5daa154b3ccd76.tar.gz
GtkIconFactory: Remove outdated information from the docs
The stock browser was removed from gtk3-demo.
-rw-r--r--gtk/deprecated/gtkiconfactory.c3
-rw-r--r--gtk/gtkicontheme.c2
-rw-r--r--gtk/gtknumerableicon.c26
3 files changed, 28 insertions, 3 deletions
diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
index 55e5d554b8..47bf9cc760 100644
--- a/gtk/deprecated/gtkiconfactory.c
+++ b/gtk/deprecated/gtkiconfactory.c
@@ -50,9 +50,6 @@
* @Short_description: Manipulating stock icons
* @Title: Themeable Stock Images
*
- * Browse the available stock icons using
- * the “gtk3-demo” application.
- *
* An icon factory manages a collection of #GtkIconSet; a #GtkIconSet manages a
* set of variants of a particular icon (i.e. a #GtkIconSet contains variants for
* different sizes and widget states). Icons in an icon factory are named by a
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 2d40287d7e..2bd25112df 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -5328,8 +5328,10 @@ gtk_icon_theme_lookup_by_gicon_for_scale (GtkIconTheme *icon_theme,
GList *list, *l;
GtkIconInfo *base_info, *emblem_info;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (GTK_IS_NUMERABLE_ICON (icon))
_gtk_numerable_icon_set_background_icon_size (GTK_NUMERABLE_ICON (icon), size / 2);
+G_GNUC_END_IGNORE_DEPRECATIONS
base = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon));
base_info = gtk_icon_theme_lookup_by_gicon_for_scale (icon_theme, base, size, scale, flags);
diff --git a/gtk/gtknumerableicon.c b/gtk/gtknumerableicon.c
index 836e1a7104..6316256fe4 100644
--- a/gtk/gtknumerableicon.c
+++ b/gtk/gtknumerableicon.c
@@ -51,6 +51,8 @@
#include <pango/pango.h>
#include <math.h>
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
struct _GtkNumerableIconPrivate {
gint count;
gint icon_size;
@@ -713,6 +715,8 @@ _gtk_numerable_icon_set_background_icon_size (GtkNumerableIcon *self,
* Returns: the currently displayed label
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
const gchar *
gtk_numerable_icon_get_label (GtkNumerableIcon *self)
@@ -742,6 +746,8 @@ gtk_numerable_icon_get_label (GtkNumerableIcon *self)
* has always priority.
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
void
gtk_numerable_icon_set_label (GtkNumerableIcon *self,
@@ -767,6 +773,8 @@ gtk_numerable_icon_set_label (GtkNumerableIcon *self,
* Returns: the currently displayed value
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
gint
gtk_numerable_icon_get_count (GtkNumerableIcon *self)
@@ -791,6 +799,8 @@ gtk_numerable_icon_get_count (GtkNumerableIcon *self)
* and gtk_numerable_icon_set_label() has always priority.
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
void
gtk_numerable_icon_set_count (GtkNumerableIcon *self,
@@ -819,6 +829,8 @@ gtk_numerable_icon_set_count (GtkNumerableIcon *self,
* Use g_object_ref() if you want to keep it around
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
GtkStyleContext *
gtk_numerable_icon_get_style_context (GtkNumerableIcon *self)
@@ -837,6 +849,8 @@ gtk_numerable_icon_get_style_context (GtkNumerableIcon *self)
* given #GtkStyleContext.
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
void
gtk_numerable_icon_set_style_context (GtkNumerableIcon *self,
@@ -877,6 +891,8 @@ gtk_numerable_icon_set_style_context (GtkNumerableIcon *self,
* gtk_numerable_icon_set_background_icon_name() has always priority.
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
void
gtk_numerable_icon_set_background_gicon (GtkNumerableIcon *self,
@@ -909,6 +925,8 @@ gtk_numerable_icon_set_background_gicon (GtkNumerableIcon *self,
* Returns: (transfer none): a #GIcon, or %NULL
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
GIcon *
gtk_numerable_icon_get_background_gicon (GtkNumerableIcon *self)
@@ -940,6 +958,8 @@ gtk_numerable_icon_get_background_gicon (GtkNumerableIcon *self)
* and gtk_numerable_icon_set_background_gicon() has always priority.
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
void
gtk_numerable_icon_set_background_icon_name (GtkNumerableIcon *self,
@@ -978,6 +998,8 @@ gtk_numerable_icon_set_background_icon_name (GtkNumerableIcon *self,
* Returns: an icon name, or %NULL
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
const gchar *
gtk_numerable_icon_get_background_icon_name (GtkNumerableIcon *self)
@@ -996,6 +1018,8 @@ gtk_numerable_icon_get_background_icon_name (GtkNumerableIcon *self)
* Returns: (transfer full): a new #GIcon
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
GIcon *
gtk_numerable_icon_new (GIcon *base_icon)
@@ -1019,6 +1043,8 @@ gtk_numerable_icon_new (GIcon *base_icon)
* Returns: (transfer full): a new #GIcon
*
* Since: 3.0
+ *
+ * Deprecated: 3.14
*/
GIcon *
gtk_numerable_icon_new_with_style_context (GIcon *base_icon,