filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog

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

diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 1a6b6fb7a651fb35e36c99414c47ced6b0b3cbd7..a92afdc36a0783ce57968cdc0f5f7e17c2f3bb93 100644 (file)
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -34,10 +34,6 @@ G_BEGIN_DECLS
 typedef struct _GtkStyleProperty           GtkStyleProperty;
 typedef struct _GtkStylePropertyClass      GtkStylePropertyClass;
 
-typedef enum {
-  GTK_STYLE_PROPERTY_INHERIT = (1 << 0)
-} GtkStylePropertyFlags;
-
 typedef GtkCssValue *   (* GtkStyleQueryFunc)        (guint                   id,
                                                      gpointer                data);
 
@@ -62,8 +58,7 @@ struct _GtkStylePropertyClass
                                                             GtkStyleQueryFunc       query_func,
                                                             gpointer                query_data);
   GtkCssValue *     (* parse_value)                        (GtkStyleProperty *      property,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+                                                            GtkCssParser           *parser);
 
   GHashTable   *properties;
 };
@@ -77,8 +72,7 @@ GtkStyleProperty *       _gtk_style_property_lookup        (const char
 const char *             _gtk_style_property_get_name      (GtkStyleProperty       *property);
 
 GtkCssValue *            _gtk_style_property_parse_value   (GtkStyleProperty *      property,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+                                                            GtkCssParser           *parser);
 
 GType                    _gtk_style_property_get_value_type(GtkStyleProperty *      property);
 void                     _gtk_style_property_query         (GtkStyleProperty *      property,