X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssparserprivate.h;h=3c6f3ba81bfb8792aab1e9878c1b28a88551868d;hb=17d3775555888151780fa404242e734a8e7f6b21;hp=faeeda2b9b01159799ea21bbea574ab77b66ddf7;hpb=662d6787f3044dec46baf8263b7a35bbba5d697f;p=~andy%2Fgtk

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index faeeda2b9..3c6f3ba81 100644
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -20,20 +20,9 @@
 
 #include "gtk/gtkcsstypesprivate.h"
 #include <gtk/gtkcssprovider.h>
-#include <gtk/gtksymboliccolor.h>
 
 G_BEGIN_DECLS
 
-typedef enum /*< skip >*/ {
-  GTK_CSS_POSITIVE_ONLY = (1 << 0),
-  GTK_CSS_PARSE_PERCENT = (1 << 1),
-  GTK_CSS_PARSE_NUMBER = (1 << 2),
-  GTK_CSS_NUMBER_AS_PIXELS = (1 << 3),
-  GTK_CSS_PARSE_LENGTH = (1 << 4),
-  GTK_CSS_PARSE_ANGLE = (1 << 5),
-  GTK_CSS_PARSE_TIME = (1 << 6)
-} GtkCssNumberParseFlags;
-
 typedef struct _GtkCssParser GtkCssParser;
 
 typedef void (* GtkCssParserErrorFunc) (GtkCssParser *parser,
@@ -41,6 +30,7 @@ typedef void (* GtkCssParserErrorFunc) (GtkCssParser *parser,
                                         gpointer      user_data);
 
 GtkCssParser *  _gtk_css_parser_new               (const char            *data,
+                                                   GFile                 *file,
                                                    GtkCssParserErrorFunc  error_func,
                                                    gpointer               user_data);
 void            _gtk_css_parser_free              (GtkCssParser          *parser);
@@ -57,6 +47,9 @@ void            _gtk_css_parser_error_full        (GtkCssParser          *parser
 
 guint           _gtk_css_parser_get_line          (GtkCssParser          *parser);
 guint           _gtk_css_parser_get_position      (GtkCssParser          *parser);
+GFile *         _gtk_css_parser_get_file          (GtkCssParser          *parser);
+GFile *         _gtk_css_parser_get_file_for_path (GtkCssParser          *parser,
+                                                   const char            *path);
 
 gboolean        _gtk_css_parser_is_eof            (GtkCssParser          *parser);
 gboolean        _gtk_css_parser_begins_with       (GtkCssParser          *parser,
@@ -91,17 +84,13 @@ gboolean        _gtk_css_parser_try_length        (GtkCssParser          *parser
 gboolean        _gtk_css_parser_try_enum          (GtkCssParser          *parser,
                                                    GType                  enum_type,
                                                    int                   *value);
+gboolean        _gtk_css_parser_try_hash_color    (GtkCssParser          *parser,
+                                                   GdkRGBA               *rgba);
 
 gboolean        _gtk_css_parser_has_number        (GtkCssParser          *parser);
-gboolean        _gtk_css_parser_read_number       (GtkCssParser          *parser,
-                                                   GtkCssNumber          *number,
-                                                   GtkCssNumberParseFlags flags);
 char *          _gtk_css_parser_read_string       (GtkCssParser          *parser);
 char *          _gtk_css_parser_read_value        (GtkCssParser          *parser);
-GtkSymbolicColor *_gtk_css_parser_read_symbolic_color
-                                                  (GtkCssParser          *parser);
-GFile *         _gtk_css_parser_read_url          (GtkCssParser          *parser,
-                                                   GFile                 *base);
+GFile *         _gtk_css_parser_read_url          (GtkCssParser          *parser);
 
 void            _gtk_css_parser_skip_whitespace   (GtkCssParser          *parser);
 void            _gtk_css_parser_resync            (GtkCssParser          *parser,