css: Redo StyleProvider interface

We now use the GtkStleProviderPrivate interface, which hopefully is faster and more conformant to CSS. Long term, it definitely should be both. I would have liked to split this up into multiple commits, but couldn't find a way.
2011-12-28 22:59:55 +01:00
parent 38a9b28a0e
commit ba5e7012b1
13 changed files with 634 additions and 49 deletions
--- a/gtk/gtkstyleproviderprivate.h
+++ b/gtk/gtkstyleproviderprivate.h
@ -0,0 +1,62 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_STYLE_PROVIDER_PRIVATE_H__
+#define __GTK_STYLE_PROVIDER_PRIVATE_H__
+
+#include <glib-object.h>
+#include "gtk/gtkcsslookupprivate.h"
+#include <gtk/gtkenums.h>
+#include <gtk/gtksymboliccolor.h>
+#include <gtk/gtkwidgetpath.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_STYLE_PROVIDER_PRIVATE          (_gtk_style_provider_private_get_type ())
+#define GTK_STYLE_PROVIDER_PRIVATE(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_STYLE_PROVIDER_PRIVATE, GtkStyleProviderPrivate))
+#define GTK_IS_STYLE_PROVIDER_PRIVATE(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_STYLE_PROVIDER_PRIVATE))
+#define GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE(o)  (G_TYPE_INSTANCE_GET_INTERFACE ((o), GTK_TYPE_STYLE_PROVIDER_PRIVATE, GtkStyleProviderPrivateInterface))
+
+typedef struct _GtkStyleProviderPrivateInterface GtkStyleProviderPrivateInterface;
+typedef struct _GtkStyleProviderPrivate GtkStyleProviderPrivate; /* dummy typedef */
+
+struct _GtkStyleProviderPrivateInterface
+{
+  GTypeInterface g_iface;
+
+  GtkSymbolicColor *    (* get_color)           (GtkStyleProviderPrivate *provider,
+                                                 const char              *name);
+  void                  (* lookup)              (GtkStyleProviderPrivate *provider,
+                                                 GtkWidgetPath           *path,
+                                                 GtkStateFlags            state,
+                                                 GtkCssLookup            *lookup);
+};
+
+GType                   _gtk_style_provider_private_get_type     (void) G_GNUC_CONST;
+
+GtkSymbolicColor *      _gtk_style_provider_private_get_color    (GtkStyleProviderPrivate *provider,
+                                                                  const char              *name);
+void                    _gtk_style_provider_private_lookup       (GtkStyleProviderPrivate *provider,
+                                                                  GtkWidgetPath           *path,
+                                                                  GtkStateFlags            state,
+                                                                  GtkCssLookup            *lookup);
+
+G_END_DECLS
+
+#endif /* __GTK_STYLE_PROVIDER_PRIVATE_H__ */