Display an error when we come to the root.

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

diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index fd22b8db54d55b780da0d4189b2b8730d06506cf..38fb51492e15416648570441d31f129a13230001 100644 (file)
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -30,9 +30,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkrc.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
 
@@ -63,6 +61,12 @@ struct _GtkIconFactoryClass
   void (*_gtk_reserved4) (void);
 };
 
+#ifdef G_OS_WIN32
+/* Reserve old names for DLL ABI backward compatibility */
+#define gtk_icon_source_set_filename gtk_icon_source_set_filename_utf8
+#define gtk_icon_source_get_filename gtk_icon_source_get_filename_utf8
+#endif
+
 GType           gtk_icon_factory_get_type (void) G_GNUC_CONST;
 GtkIconFactory* gtk_icon_factory_new      (void);
 void            gtk_icon_factory_add      (GtkIconFactory *factory,
@@ -174,9 +178,8 @@ GtkIconSize      gtk_icon_source_get_size                 (const GtkIconSource *
 /* ignore this */
 void _gtk_icon_set_invalidate_caches (void);
 GSList* _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__ */