Remove a workaround for old toolbar api

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

diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index 770760097e50bd2b9adb829f5898f705a3714920..fb923c2f6b0e12ae33e3a80f3af724538360a1c7 100644 (file)
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -21,18 +21,20 @@
  * 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_RC_H__
 #define __GTK_RC_H__
 
 
 #include <gtk/gtkstyle.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Forward declarations */
 typedef struct _GtkIconFactory  GtkIconFactory;
@@ -60,7 +62,7 @@ struct _GtkRcStyle
   GObject parent_instance;
 
   /*< public >*/
-  
+
   gchar *name;
   gchar *bg_pixmap_name[5];
   PangoFontDescription *font_desc;
@@ -76,7 +78,7 @@ struct _GtkRcStyle
 
   /*< private >*/
   GArray *rc_properties;
-  
+
   /* list of RC style lists including this RC style */
   GSList *rc_style_lists;
 
@@ -97,14 +99,14 @@ struct _GtkRcStyleClass
   GtkRcStyle * (*create_rc_style) (GtkRcStyle *rc_style);
 
   /* Fill in engine specific parts of GtkRcStyle by parsing contents
-   * of brackets. Returns G_TOKEN_NONE if succesful, otherwise returns
+   * of brackets. Returns G_TOKEN_NONE if successful, otherwise returns
    * the token it expected but didn't get.
    */
   guint     (*parse)  (GtkRcStyle   *rc_style,
                       GtkSettings  *settings,
                       GScanner     *scanner);
-  
-  /* Combine RC style data from src into dest. If overriden, this
+
+  /* Combine RC style data from src into dest. If overridden, this
    * function should chain to the parent.
    */
   void      (*merge)  (GtkRcStyle *dest,
@@ -121,7 +123,21 @@ struct _GtkRcStyleClass
   void (*_gtk_reserved4) (void);
 };
 
-void     _gtk_rc_init                  (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);
+gboolean  _gtk_rc_match_widget_class     (GSList       *list,
+                                          gint          length,
+                                          gchar        *path,
+                                          gchar        *path_reversed);
+
 void      gtk_rc_add_default_file      (const gchar *filename);
 void      gtk_rc_set_default_files      (gchar **filenames);
 gchar**   gtk_rc_get_default_files      (void);
@@ -133,6 +149,8 @@ GtkStyle* gtk_rc_get_style_by_paths     (GtkSettings *settings,
 
 gboolean gtk_rc_reparse_all_for_settings (GtkSettings *settings,
                                          gboolean     force_load);
+void     gtk_rc_reset_styles             (GtkSettings *settings);
+
 gchar*   gtk_rc_find_pixmap_in_path (GtkSettings  *settings,
                                     GScanner     *scanner,
                                     const gchar  *pixmap_file);
@@ -141,21 +159,9 @@ 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);
-void        gtk_rc_style_ref        (GtkRcStyle *rc_style);
-void        gtk_rc_style_unref      (GtkRcStyle *rc_style);
 
 gchar*         gtk_rc_find_module_in_path      (const gchar    *module_file);
 gchar*         gtk_rc_get_theme_dir            (void);
@@ -202,18 +208,22 @@ typedef enum {
   GTK_RC_TOKEN_STOCK,
   GTK_RC_TOKEN_LTR,
   GTK_RC_TOKEN_RTL,
+  GTK_RC_TOKEN_COLOR,
+  GTK_RC_TOKEN_UNBIND,
   GTK_RC_TOKEN_LAST
 } GtkRcTokenType;
 
 GScanner* gtk_rc_scanner_new   (void);
 guint    gtk_rc_parse_color    (GScanner            *scanner,
                                 GdkColor            *color);
+guint    gtk_rc_parse_color_full (GScanner          *scanner,
+                                   GtkRcStyle        *style,
+                                  GdkColor          *color);
 guint    gtk_rc_parse_state    (GScanner            *scanner,
                                 GtkStateType        *state);
 guint    gtk_rc_parse_priority (GScanner            *scanner,
                                 GtkPathPriorityType *priority);
 
-
 /* rc properties
  * (structure forward declared in gtkstyle.h)
  */
@@ -230,12 +240,21 @@ struct _GtkRcProperty
 const GtkRcProperty* _gtk_rc_style_lookup_rc_property (GtkRcStyle *rc_style,
                                                       GQuark      type_name,
                                                       GQuark      property_name);
+void         _gtk_rc_style_set_rc_property           (GtkRcStyle *rc_style,
+                                                      GtkRcProperty *property);
+void         _gtk_rc_style_unset_rc_property         (GtkRcStyle *rc_style,
+                                                      GQuark      type_name,
+                                                      GQuark      property_name);
 
-const gchar* _gtk_rc_context_get_default_font_name (GtkSettings *settings);
+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);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+const gchar* _gtk_rc_context_get_default_font_name (GtkSettings *settings);
+void         _gtk_rc_context_destroy               (GtkSettings *settings);
 
+G_END_DECLS
 
 #endif /* __GTK_RC_H__ */