[gtk+/wip/ricotz/deprecated: 3/4] iconset: Remove stray references
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/ricotz/deprecated: 3/4] iconset: Remove stray references
- Date: Sun, 23 Oct 2016 09:12:56 +0000 (UTC)
commit 2273f5d28e3ecef096f9ed6eb3badac09f7dc171
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sun Oct 23 10:40:04 2016 +0200
iconset: Remove stray references
demos/gtk-demo/main.c | 1 -
docs/reference/gtk/gtk4-sections.txt | 1 -
gtk/a11y/gtkimageaccessible.c | 1 -
gtk/gtkimage.h | 2 --
gtk/gtktypes.h | 1 -
testsuite/gtk/builder.c | 10 ----------
6 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index ea7da0a..f08416c 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -233,7 +233,6 @@ static gchar *types[] =
"GtkActionEntry ",
"GtkRadioActionEntry ",
"GtkIconFactory ",
- "GtkIconSet ",
"GtkTextBuffer ",
"GtkStatusbar ",
"GtkTextIter ",
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 395bec2..adb4032 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1689,7 +1689,6 @@ GTK_IMAGE_GET_CLASS
<SUBSECTION Private>
GtkImagePrivate
gtk_image_get_type
-GtkImageIconSetData
GtkImagePixbufData
GtkImageAnimationData
GtkImageIconNameData
diff --git a/gtk/a11y/gtkimageaccessible.c b/gtk/a11y/gtkimageaccessible.c
index 72d0300..dc398c8 100644
--- a/gtk/a11y/gtkimageaccessible.c
+++ b/gtk/a11y/gtkimageaccessible.c
@@ -279,7 +279,6 @@ gtk_image_accessible_get_image_size (AtkImage *image,
*width = gdk_pixbuf_get_width (pixbuf);
break;
}
- case GTK_IMAGE_ICON_SET:
case GTK_IMAGE_ICON_NAME:
case GTK_IMAGE_GICON:
{
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index ef28c39..17318ff 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -52,7 +52,6 @@ typedef struct _GtkImageClass GtkImageClass;
* GtkImageType:
* @GTK_IMAGE_EMPTY: there is no image displayed by the widget
* @GTK_IMAGE_PIXBUF: the widget contains a #GdkPixbuf
- * @GTK_IMAGE_ICON_SET: the widget contains a #GtkIconSet
* @GTK_IMAGE_ANIMATION: the widget contains a #GdkPixbufAnimation
* @GTK_IMAGE_ICON_NAME: the widget contains a named icon.
* This image type was added in GTK+ 2.6
@@ -73,7 +72,6 @@ typedef enum
{
GTK_IMAGE_EMPTY,
GTK_IMAGE_PIXBUF,
- GTK_IMAGE_ICON_SET,
GTK_IMAGE_ANIMATION,
GTK_IMAGE_ICON_NAME,
GTK_IMAGE_GICON,
diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index 243aabb..95bac78 100644
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -34,7 +34,6 @@ G_BEGIN_DECLS
typedef struct _GtkAdjustment GtkAdjustment;
typedef struct _GtkBuilder GtkBuilder;
typedef struct _GtkClipboard GtkClipboard;
-typedef struct _GtkIconSet GtkIconSet;
typedef struct _GtkIconSource GtkIconSource;
typedef struct _GtkRequisition GtkRequisition;
typedef struct _GtkSelectionData GtkSelectionData;
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index cf5b1f4..60fc331 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -35,16 +35,6 @@ void signal_second (GtkButton *button, GParamSpec *spec);
void signal_extra (GtkButton *button, GParamSpec *spec);
void signal_extra2 (GtkButton *button, GParamSpec *spec);
-/* Copied from gtkiconfactory.c; keep in sync! */
-struct _GtkIconSet
-{
- guint ref_count;
- GSList *sources;
- GSList *cache;
- guint cache_size;
- guint cache_serial;
-};
-
static GtkBuilder *
builder_new_from_string (const gchar *buffer,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]