X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkiconfactory.h;h=fabf9288e08e657220fd1251409483e0947f024f;hb=1074aa0c49f647ed4b2a969618051c59da5aad01;hp=4100205df7e9c43fea4c07c91c3d5d8529e83074;hpb=a78ab0cfa1d5e5e15d505bce0761a00708400ce3;p=~andy%2Fgtk
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 4100205df..fabf9288e 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
@@ -24,17 +22,16 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_ICON_FACTORY_H__
+#define __GTK_ICON_FACTORY_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GTK_ICON_FACTORY_H__
-#define __GTK_ICON_FACTORY_H__
-
#include
-#include
#include
-#include
+#include
G_BEGIN_DECLS
@@ -52,12 +49,6 @@ typedef struct _GtkIconFactory GtkIconFactory;
typedef struct _GtkIconFactoryPrivate GtkIconFactoryPrivate;
typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
-typedef struct _GtkIconSet GtkIconSet;
-typedef struct _GtkIconSource GtkIconSource;
-
-typedef struct _GtkStyle GtkStyle;
-typedef struct _GtkRcStyle GtkRcStyle;
-
struct _GtkIconFactory
{
GObject parent_instance;
@@ -130,7 +121,7 @@ GtkIconSet* gtk_icon_set_ref (GtkIconSet *icon_set);
void gtk_icon_set_unref (GtkIconSet *icon_set);
GtkIconSet* gtk_icon_set_copy (GtkIconSet *icon_set);
-GDK_DEPRECATED_FOR(gtk_icon_set_render_icon_pixbuf)
+GDK_DEPRECATED_IN_3_0_FOR(gtk_icon_set_render_icon_pixbuf)
GdkPixbuf* gtk_icon_set_render_icon (GtkIconSet *icon_set,
GtkStyle *style,
GtkTextDirection direction,