Remove a workaround for old toolbar api

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

diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index d3b3b9974f1e0cf4bb1e93e0b8951ab219bf6fed..fb923c2f6b0e12ae33e3a80f3af724538360a1c7 100644 (file)
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -21,10 +21,10 @@
  * 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_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
 
@@ -62,7 +62,7 @@ struct _GtkRcStyle
   GObject parent_instance;
 
   /*< public >*/
-  
+
   gchar *name;
   gchar *bg_pixmap_name[5];
   PangoFontDescription *font_desc;
@@ -78,7 +78,7 @@ struct _GtkRcStyle
 
   /*< private >*/
   GArray *rc_properties;
-  
+
   /* list of RC style lists including this RC style */
   GSList *rc_style_lists;
 
@@ -105,7 +105,7 @@ struct _GtkRcStyleClass
   guint     (*parse)  (GtkRcStyle   *rc_style,
                       GtkSettings  *settings,
                       GScanner     *scanner);
-  
+
   /* Combine RC style data from src into dest. If overridden, this
    * function should chain to the parent.
    */
@@ -159,25 +159,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 +248,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);