gdk: Update gdk_settings_map for blink timeout to work

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

diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index 8f30c1feb66f91bf90392ee437e3fb8139be85b7..598906dd80c7147219a97122480084c573f0f080 100644 (file)
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -123,13 +123,6 @@ struct _GtkRcStyleClass
   void (*_gtk_reserved4) (void);
 };
 
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_rc_add_default_file gtk_rc_add_default_file_utf8
-#define gtk_rc_set_default_files gtk_rc_set_default_files_utf8
-#define gtk_rc_parse gtk_rc_parse_utf8
-#endif
-
 void     _gtk_rc_init                   (void);
 GSList*   _gtk_rc_parse_widget_class_path (const gchar *pattern);
 void      _gtk_rc_free_widget_class_path (GSList       *list);
@@ -159,25 +152,10 @@ void        gtk_rc_parse                  (const gchar *filename);
 void     gtk_rc_parse_string           (const gchar *rc_string);
 gboolean  gtk_rc_reparse_all           (void);
 
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_rc_add_widget_name_style  (GtkRcStyle   *rc_style,
-                                        const gchar  *pattern);
-void     gtk_rc_add_widget_class_style (GtkRcStyle   *rc_style,
-                                        const gchar  *pattern);
-void     gtk_rc_add_class_style        (GtkRcStyle   *rc_style,
-                                        const gchar  *pattern);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-
 GType       gtk_rc_style_get_type   (void) G_GNUC_CONST;
 GtkRcStyle* gtk_rc_style_new        (void);
 GtkRcStyle* gtk_rc_style_copy       (GtkRcStyle *orig);
 
-#ifndef GTK_DISABLE_DEPRECATED
-void        gtk_rc_style_ref        (GtkRcStyle *rc_style);
-void        gtk_rc_style_unref      (GtkRcStyle *rc_style);
-#endif
-
 gchar*         gtk_rc_find_module_in_path      (const gchar    *module_file);
 gchar*         gtk_rc_get_theme_dir            (void);
 gchar*         gtk_rc_get_module_dir           (void);
@@ -263,6 +241,10 @@ void             _gtk_rc_style_unset_rc_property         (GtkRcStyle *rc_style,
 
 GSList     * _gtk_rc_style_get_color_hashes        (GtkRcStyle *rc_style);
 
+void         _gtk_rc_style_set_symbolic_color       (GtkRcStyle     *rc_style,
+                                                     const gchar    *name,
+                                                     const GdkColor *color);
+
 const gchar* _gtk_rc_context_get_default_font_name (GtkSettings *settings);
 void         _gtk_rc_context_destroy               (GtkSettings *settings);