[gtk+] GtkIconFactory: Remove outdated information from the docs



commit 7b1706065435fe58c448b1ec5980c7acb00abe92
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun May 11 22:01:37 2014 -0400

    GtkIconFactory: Remove outdated information from the docs
    
    The stock browser was removed from gtk3-demo.

 gtk/deprecated/gtkiconfactory.c   |    3 ---
 gtk/deprecated/gtknumerableicon.c |   26 ++++++++++++++++++++++++++
 gtk/gtkicontheme.c                |    4 +++-
 3 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
index 55e5d55..47bf9cc 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/deprecated/gtknumerableicon.c b/gtk/deprecated/gtknumerableicon.c
index 836e1a7..6316256 100644
--- a/gtk/deprecated/gtknumerableicon.c
+++ b/gtk/deprecated/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,
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 2d40287..1d9209a 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -44,7 +44,7 @@
 #include "gtkbuiltincache.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
-#include "gtknumerableiconprivate.h"
+#include "deprecated/gtknumerableiconprivate.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
 
@@ -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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]