[gtk+/wip/otte/gtk4: 24/127] API: Remove GtkNumerableIcon



commit 2d4701da95a8a6e98f43f1bad1a2e8ca325a7844
Author: Benjamin Otte <otte redhat com>
Date:   Wed Sep 28 17:09:41 2016 +0200

    API: Remove GtkNumerableIcon

 docs/reference/gtk/Makefile.am               |    2 -
 docs/reference/gtk/gtk-docs.sgml             |    1 -
 docs/reference/gtk/gtk3-sections.txt         |   29 -
 docs/reference/gtk/gtk3.types.in             |    1 -
 docs/reference/gtk/images/numerableicon.png  |  Bin 2645 -> 0 bytes
 docs/reference/gtk/images/numerableicon2.png |  Bin 2329 -> 0 bytes
 gtk/deprecated/Makefile.inc                  |    3 -
 gtk/deprecated/gtknumerableicon.c            | 1056 --------------------------
 gtk/deprecated/gtknumerableicon.h            |  100 ---
 gtk/deprecated/gtknumerableiconprivate.h     |   34 -
 gtk/gtk.h                                    |    1 -
 gtk/gtkicontheme.c                           |    6 -
 gtk/makefile.msc.in                          |    1 -
 tests/Makefile.am                            |    5 -
 tests/testnumerableicon.c                    |  160 ----
 15 files changed, 0 insertions(+), 1399 deletions(-)
---
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 5a88a12..846372a 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -450,8 +450,6 @@ HTML_IMAGES = \
        $(srcdir)/images/focus.png                                      \
        $(srcdir)/images/handles.png                                    \
        $(srcdir)/images/extensions.png                                 \
-       $(srcdir)/images/numerableicon.png                              \
-       $(srcdir)/images/numerableicon2.png                             \
        $(srcdir)/images/bloatpad-osx.png                               \
        $(srcdir)/images/bloatpad-gnome.png                             \
        $(srcdir)/images/bloatpad-xfce.png                              \
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 8c962ae..a44a5b2 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -349,7 +349,6 @@
       <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkstock.xml" />
       <xi:include href="xml/gtkiconfactory.xml" />
-      <xi:include href="xml/gtknumerableicon.xml" />
       <xi:include href="xml/gtkarrow.xml" />
       <xi:include href="xml/gtkstatusicon.xml" />
       <xi:include href="xml/gtkthemingengine.xml" />
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 40b67e8..6ce7a69 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -2606,35 +2606,6 @@ GtkNotebookPrivate
 </SECTION>
 
 <SECTION>
-<FILE>gtknumerableicon</FILE>
-<TITLE>GtkNumerableIcon</TITLE>
-GtkNumerableIcon
-gtk_numerable_icon_new
-gtk_numerable_icon_new_with_style_context
-gtk_numerable_icon_get_background_gicon
-gtk_numerable_icon_set_background_gicon
-gtk_numerable_icon_get_background_icon_name
-gtk_numerable_icon_set_background_icon_name
-gtk_numerable_icon_get_count
-gtk_numerable_icon_set_count
-gtk_numerable_icon_get_label
-gtk_numerable_icon_set_label
-gtk_numerable_icon_get_style_context
-gtk_numerable_icon_set_style_context
-<SUBSECTION Standard>
-GTK_NUMERABLE_ICON
-GTK_IS_NUMERABLE_ICON
-GTK_TYPE_NUMERABLE_ICON
-GTK_NUMERABLE_ICON_CLASS
-GTK_IS_NUMERABLE_ICON_CLASS
-GTK_NUMERABLE_ICON_GET_CLASS
-
-<SUBSECTION Private>
-GtkNumerableIconPrivate
-gtk_numerable_icon_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkoffscreenwindow</FILE>
 <TITLE>GtkOffscreenWindow</TITLE>
 GtkOffscreenWindow
diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk3.types.in
index 9f7d512..54bc119 100644
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -129,7 +129,6 @@ gtk_misc_get_type
 gtk_model_button_get_type
 gtk_mount_operation_get_type
 gtk_notebook_get_type
-gtk_numerable_icon_get_type
 gtk_offscreen_window_get_type
 gtk_orientable_get_type
 gtk_overlay_get_type
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index 1eb292a..4d2ba56 100644
--- a/gtk/deprecated/Makefile.inc
+++ b/gtk/deprecated/Makefile.inc
@@ -19,7 +19,6 @@ deprecated_h_sources =                        \
        deprecated/gtkiconfactory.h     \
        deprecated/gtkimagemenuitem.h   \
        deprecated/gtkmisc.h            \
-       deprecated/gtknumerableicon.h   \
        deprecated/gtkradioaction.h     \
        deprecated/gtkrc.h              \
        deprecated/gtkrecentaction.h    \
@@ -41,7 +40,6 @@ deprecated_h_sources =                        \
 deprecated_private_h_sources =                 \
        deprecated/gtkgradientprivate.h         \
        deprecated/gtkiconfactoryprivate.h      \
-       deprecated/gtknumerableiconprivate.h    \
        deprecated/gtkstylepropertiesprivate.h  \
        deprecated/gtksymboliccolorprivate.h
 
@@ -66,7 +64,6 @@ deprecated_c_sources =                        \
        deprecated/gtkiconfactory.c     \
        deprecated/gtkimagemenuitem.c   \
        deprecated/gtkmisc.c            \
-       deprecated/gtknumerableicon.c   \
        deprecated/gtkradioaction.c     \
        deprecated/gtkrc.c              \
        deprecated/gtkrecentaction.c    \
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 518b882..6a41b0d 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -264,7 +264,6 @@
 #include <gtk/deprecated/gtkiconfactory.h>
 #include <gtk/deprecated/gtkimagemenuitem.h>
 #include <gtk/deprecated/gtkmisc.h>
-#include <gtk/deprecated/gtknumerableicon.h>
 #include <gtk/deprecated/gtkradioaction.h>
 #include <gtk/deprecated/gtkrc.h>
 #include <gtk/deprecated/gtkrecentaction.h>
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 5a416b7..4eec9fe 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -45,7 +45,6 @@
 #include "gtkiconcache.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
-#include "deprecated/gtknumerableiconprivate.h"
 #include "gtksettingsprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkprivate.h"
@@ -5560,11 +5559,6 @@ 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);
       if (base_info)
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 78a5244..17ff80c 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -251,7 +251,6 @@ gtk_OBJECTS = \
        gtkmountoperation.obj \
        gtkmountoperation-stub.obj \
        gtknotebook.obj \
-       gtknumerableicon.obj \
        gtkoffscreenwindow.obj \
        gtkorientable.obj \
        gtkpagesetup.obj \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 89f3e3a..398ded8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -100,7 +100,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)    \
        testmountoperation              \
        testmultidisplay                \
        testnotebookdnd                 \
-       testnumerableicon               \
        testnouiprint                   \
        testoffscreen                   \
        testoffscreenwindow             \
@@ -234,7 +233,6 @@ testmountoperation_DEPENDENCIES = $(TEST_DEPS)
 testmultidisplay_DEPENDENCIES = $(TEST_DEPS)
 testnotebookdnd_DEPENDENCIES = $(TEST_DEPS)
 testnouiprint_DEPENDENCIES = $(TEST_DEPS)
-testnumerableicon_DEPENDENCIES = $(TEST_DEPS)
 testoffscreen_DEPENDENCIES = $(TEST_DEPS)
 testoffscreenwindow_DEPENDENCIES = $(TEST_DEPS)
 testappchooser_DEPENDENCIES = $(TEST_DEPS)
@@ -431,9 +429,6 @@ testiconview_SOURCES =              \
 testiconview_keynav_SOURCES =  \
        testiconview-keynav.c
 
-testnumerableicon_SOURCES =    \
-       testnumerableicon.c
-
 testrecentchooser_SOURCES =    \
        testrecentchooser.c
 


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