Finish making the GtkSettings object identical on all backends so that it doesn't...

[~andy/gtk] / gtk / gtkiconfactory.h

diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 200c0ad59a81b630eeae55e1b9d7e37f4cd603a6..1faf7b73cdda183ecc7f256b7eee2f750e42e12a 100644 (file)
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -21,20 +21,21 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_ICON_FACTORY_H__
 #define __GTK_ICON_FACTORY_H__
 
 #include <gdk/gdk.h>
 #include <gtk/gtkrc.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
 
 #define GTK_TYPE_ICON_FACTORY              (gtk_icon_factory_get_type ())
 #define GTK_ICON_FACTORY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ICON_FACTORY, GtkIconFactory))
@@ -45,11 +46,15 @@ typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
 #define GTK_TYPE_ICON_SET                  (gtk_icon_set_get_type ())
 #define GTK_TYPE_ICON_SOURCE               (gtk_icon_source_get_type ())
 
+typedef struct _GtkIconFactoryPrivate       GtkIconFactoryPrivate;
+typedef struct _GtkIconFactoryClass         GtkIconFactoryClass;
+
 struct _GtkIconFactory
 {
   GObject parent_instance;
 
-  GHashTable *icons;
+  /*< private >*/
+  GtkIconFactoryPrivate *priv;
 };
 
 struct _GtkIconFactoryClass
@@ -63,7 +68,7 @@ struct _GtkIconFactoryClass
   void (*_gtk_reserved4) (void);
 };
 
-GType           gtk_icon_factory_get_type (void);
+GType           gtk_icon_factory_get_type (void) G_GNUC_CONST;
 GtkIconFactory* gtk_icon_factory_new      (void);
 void            gtk_icon_factory_add      (GtkIconFactory *factory,
                                            const gchar    *stock_id,
@@ -108,7 +113,7 @@ G_CONST_RETURN gchar* gtk_icon_size_get_name       (GtkIconSize  size);
 
 /* Icon sets */
 
-GType       gtk_icon_set_get_type        (void);
+GType       gtk_icon_set_get_type        (void) G_GNUC_CONST;
 GtkIconSet* gtk_icon_set_new             (void);
 GtkIconSet* gtk_icon_set_new_from_pixbuf (GdkPixbuf       *pixbuf);
 
@@ -116,6 +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.
  */
@@ -125,8 +131,8 @@ GdkPixbuf*  gtk_icon_set_render_icon     (GtkIconSet      *icon_set,
                                           GtkStateType     state,
                                           GtkIconSize      size,
                                           GtkWidget       *widget,
-                                          const char      *detail);
-
+                                          const gchar     *detail);
+#endif
 
 void           gtk_icon_set_add_source   (GtkIconSet          *icon_set,
                                           const GtkIconSource *source);
@@ -135,7 +141,7 @@ void           gtk_icon_set_get_sizes    (GtkIconSet          *icon_set,
                                           GtkIconSize        **sizes,
                                           gint                *n_sizes);
 
-GType          gtk_icon_source_get_type                 (void);
+GType          gtk_icon_source_get_type                 (void) G_GNUC_CONST;
 GtkIconSource* gtk_icon_source_new                      (void);
 GtkIconSource* gtk_icon_source_copy                     (const GtkIconSource *source);
 void           gtk_icon_source_free                     (GtkIconSource       *source);
@@ -173,10 +179,9 @@ GtkIconSize      gtk_icon_source_get_size                 (const GtkIconSource *
 
 /* ignore this */
 void _gtk_icon_set_invalidate_caches (void);
-GSList* _gtk_icon_factory_list_ids (void);
+GList* _gtk_icon_factory_list_ids (void);
+void _gtk_icon_factory_ensure_default_icons (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_ICON_FACTORY_H__ */