X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstyleproviderprivate.c;h=1f62b88807fb5d93a8a09fa88f299b3f95583837;hb=5e2c23214564f7dcc687fa8467020eeb6b9407a9;hp=a7b0a6fcb726f038ff21c5f84a6a6747755e3a70;hpb=ba5e7012b1c4cec7f3cfcee662273d4b960e497d;p=~andy%2Fgtk

diff --git a/gtk/gtkstyleproviderprivate.c b/gtk/gtkstyleproviderprivate.c
index a7b0a6fcb..1f62b8880 100644
--- a/gtk/gtkstyleproviderprivate.c
+++ b/gtk/gtkstyleproviderprivate.c
@@ -12,29 +12,48 @@
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 
 #include "gtkstyleproviderprivate.h"
+
+#include "gtkintl.h"
 #include "gtkstyleprovider.h"
 
+enum {
+  CHANGED,
+  LAST_SIGNAL
+};
+
 G_DEFINE_INTERFACE (GtkStyleProviderPrivate, _gtk_style_provider_private, GTK_TYPE_STYLE_PROVIDER)
 
+static guint signals[LAST_SIGNAL];
+
 static void
 _gtk_style_provider_private_default_init (GtkStyleProviderPrivateInterface *iface)
 {
+  signals[CHANGED] = g_signal_new (I_("-gtk-private-changed"),
+                                   G_TYPE_FROM_INTERFACE (iface),
+                                   G_SIGNAL_RUN_LAST,
+                                   G_STRUCT_OFFSET (GtkStyleProviderPrivateInterface, changed),
+                                   NULL, NULL,
+                                   g_cclosure_marshal_VOID__VOID,
+                                   G_TYPE_NONE, 0);
+
 }
 
-GtkSymbolicColor *
+GtkCssValue *
 _gtk_style_provider_private_get_color (GtkStyleProviderPrivate *provider,
                                        const char              *name)
 {
   GtkStyleProviderPrivateInterface *iface;
 
+  /* for compat with gtk_symbolic_color_resolve() */
+  if (provider == NULL)
+    return NULL;
+
   g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL);
 
   iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider);
@@ -45,16 +64,32 @@ _gtk_style_provider_private_get_color (GtkStyleProviderPrivate *provider,
   return iface->get_color (provider, name);
 }
 
+GtkCssKeyframes *
+_gtk_style_provider_private_get_keyframes (GtkStyleProviderPrivate *provider,
+                                           const char              *name)
+{
+  GtkStyleProviderPrivateInterface *iface;
+
+  g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider);
+
+  if (!iface->get_keyframes)
+    return NULL;
+
+  return iface->get_keyframes (provider, name);
+}
+
 void
 _gtk_style_provider_private_lookup (GtkStyleProviderPrivate *provider,
-                                    GtkWidgetPath           *path,
-                                    GtkStateFlags            state,
+                                    const GtkCssMatcher     *matcher,
                                     GtkCssLookup            *lookup)
 {
   GtkStyleProviderPrivateInterface *iface;
 
   g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider));
-  g_return_if_fail (path != NULL);
+  g_return_if_fail (matcher != NULL);
   g_return_if_fail (lookup != NULL);
 
   iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider);
@@ -62,5 +97,46 @@ _gtk_style_provider_private_lookup (GtkStyleProviderPrivate *provider,
   if (!iface->lookup)
     return;
 
-  iface->lookup (provider, path, state, lookup);
+  iface->lookup (provider, matcher, lookup);
+}
+
+GtkCssChange
+_gtk_style_provider_private_get_change (GtkStyleProviderPrivate *provider,
+                                        const GtkCssMatcher     *matcher)
+{
+  GtkStyleProviderPrivateInterface *iface;
+
+  g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), GTK_CSS_CHANGE_ANY);
+  g_return_val_if_fail (matcher != NULL, GTK_CSS_CHANGE_ANY);
+
+  iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider);
+
+  if (!iface->get_change)
+    return GTK_CSS_CHANGE_ANY;
+
+  return iface->get_change (provider, matcher);
+}
+
+void
+_gtk_style_provider_private_changed (GtkStyleProviderPrivate *provider)
+{
+  g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider));
+
+  g_signal_emit (provider, signals[CHANGED], 0);
+}
+
+GtkSettings *
+_gtk_style_provider_private_get_settings (GtkStyleProviderPrivate *provider)
+{
+  GtkStyleProviderPrivateInterface *iface;
+
+  g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL);
+
+  iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider);
+
+  if (!iface->get_settings)
+    return NULL;
+
+  return iface->get_settings (provider);
 }
+