[gtk+/gtk-2-90: 97/156] Remove GtkPixmap completely



commit 13c45f55d9d7ef4e8576deb83a66afc670af6fc7
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Oct 16 00:29:44 2009 +0200

    Remove GtkPixmap completely

 docs/reference/gtk/gtk-sections.txt    |   19 --
 docs/reference/gtk/tmpl/gtkpixmap.sgml |   83 ---------
 gtk/Makefile.am                        |    2 -
 gtk/gtk.symbols                        |   12 --
 gtk/gtkpixmap.c                        |  286 --------------------------------
 gtk/gtkpixmap.h                        |   83 ---------
 gtk/gtktoolbar.h                       |    8 +-
 gtk/makefile.msc.in                    |    2 -
 8 files changed, 1 insertions(+), 494 deletions(-)
---
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index ce5ad33..3c21aa0 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -2842,25 +2842,6 @@ gtk_paned_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkpixmap</FILE>
-<TITLE>GtkPixmap</TITLE>
-GtkPixmap
-gtk_pixmap_new
-gtk_pixmap_set
-gtk_pixmap_get
-gtk_pixmap_set_build_insensitive
-<SUBSECTION Standard>
-GTK_PIXMAP
-GTK_IS_PIXMAP
-GTK_TYPE_PIXMAP
-GTK_PIXMAP_CLASS
-GTK_IS_PIXMAP_CLASS
-GTK_PIXMAP_GET_CLASS
-<SUBSECTION Private>
-gtk_pixmap_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkplug</FILE>
 <TITLE>GtkPlug</TITLE>
 GtkPlug
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4e822b2..0e6c763 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -633,11 +633,9 @@ gtk_base_c_sources =            \
 
 # Deprecated
 gtk_public_h_sources += \
-	gtkpixmap.h		\
 	gtkprogress.h		\
 	gtktooltips.h
 gtk_base_c_sources += \
-	gtkpixmap.c		\
 	gtkprogress.c		\
 	gtktooltips.c
 
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 667f142..6b479aa 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2437,18 +2437,6 @@ gtk_path_bar_get_type G_GNUC_CONST
 #endif
 #endif
 
-#if IN_HEADER(__GTK_PIXMAP_H__)
-#if IN_FILE(__GTK_PIXMAP_C__)
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_pixmap_get
-gtk_pixmap_get_type G_GNUC_CONST
-gtk_pixmap_new
-gtk_pixmap_set
-gtk_pixmap_set_build_insensitive
-#endif
-#endif
-#endif
-
 #if IN_HEADER(__GTK_PLUG_H__)
 #if IN_FILE(__GTK_PLUG_C__)
 gtk_plug_construct
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 62d40de..42cd532 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -41,15 +41,9 @@
 #include <gtk/gtktooltips.h>
 #include <gtk/gtktoolitem.h>
 
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkpixmap.h>
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
 G_BEGIN_DECLS
 
+
 #define GTK_TYPE_TOOLBAR            (gtk_toolbar_get_type ())
 #define GTK_TOOLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLBAR, GtkToolbar))
 #define GTK_TOOLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLBAR, GtkToolbarClass))
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 8094d3c..73beddd 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -114,7 +114,6 @@ gtk_OBJECTS_deprecated = \
 	gtkprogress.obj \
 	gtktipsquery.obj \
 	gtkshow.obj \
-	gtkpixmap.obj \
 	gtkpreview.obj \
 	gtkseparatortoolitem.obj \
 	gtktypeutils.obj \
@@ -468,7 +467,6 @@ gtk_public_h_sources =		\
 	gtkpagesetup.h		\
 	gtkpaned.h		\
 	gtkpapersize.h		\
-	gtkpixmap.h		\
 	gtkplug.h		\
 	gtkpreview.h		\
 	gtkprintcontext.h	\



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