X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkiconfactory.h;h=fabf9288e08e657220fd1251409483e0947f024f;hb=af0007d0d89309838fb55cc62c76793b574fa40a;hp=17b0c92651dfc1695ddb49ead3754942737ee5e8;hpb=bf0d8402f5382fadd32a9748d00a4bcd715ea07a;p=~andy%2Fgtk
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 17b0c9265..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,15 +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
G_BEGIN_DECLS
@@ -46,6 +45,7 @@ G_BEGIN_DECLS
#define GTK_TYPE_ICON_SET (gtk_icon_set_get_type ())
#define GTK_TYPE_ICON_SOURCE (gtk_icon_source_get_type ())
+typedef struct _GtkIconFactory GtkIconFactory;
typedef struct _GtkIconFactoryPrivate GtkIconFactoryPrivate;
typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
@@ -121,10 +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);
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Get one of the icon variants in the set, creating the variant if
- * necessary.
- */
+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,
@@ -132,7 +129,6 @@ GdkPixbuf* gtk_icon_set_render_icon (GtkIconSet *icon_set,
GtkIconSize size,
GtkWidget *widget,
const gchar *detail);
-#endif
void gtk_icon_set_add_source (GtkIconSet *icon_set,
const GtkIconSource *source);