[gtk+] GtkStyleSet: Implement GtkStyleProvider.
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkStyleSet: Implement GtkStyleProvider.
- Date: Sat, 4 Dec 2010 14:42:43 +0000 (UTC)
commit f969470ad8c9c9bb706fcccdb88e693cb34bfbee
Author: Carlos Garnacho <carlosg gnome org>
Date: Thu Mar 4 22:51:56 2010 +0100
GtkStyleSet: Implement GtkStyleProvider.
As simple as it can get.
gtk/gtkstyleset.c | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkstyleset.c b/gtk/gtkstyleset.c
index 332d45b..e926234 100644
--- a/gtk/gtkstyleset.c
+++ b/gtk/gtkstyleset.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include "gtkstyleprovider.h"
#include "gtkstyleset.h"
#include "gtkprivate.h"
#include "gtkintl.h"
@@ -40,10 +41,13 @@ struct GtkStyleSetPrivate
#define GTK_STYLE_SET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_STYLE_SET, GtkStyleSetPrivate))
-static void gtk_style_set_finalize (GObject *object);
+static void gtk_style_set_provider_init (GtkStyleProviderIface *iface);
+static void gtk_style_set_finalize (GObject *object);
-G_DEFINE_TYPE (GtkStyleSet, gtk_style_set, G_TYPE_OBJECT)
+G_DEFINE_TYPE_EXTENDED (GtkStyleSet, gtk_style_set, G_TYPE_OBJECT, 0,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER,
+ gtk_style_set_provider_init));
static void
gtk_style_set_class_init (GtkStyleSetClass *klass)
@@ -71,7 +75,10 @@ property_data_free (PropertyData *data)
gint i;
for (i = 0; i <= GTK_STATE_INSENSITIVE; i++)
- g_value_unset (&data->values[i]);
+ {
+ if (G_IS_VALUE (&data->values[i]))
+ g_value_unset (&data->values[i]);
+ }
g_slice_free (PropertyData, data);
}
@@ -101,6 +108,20 @@ gtk_style_set_finalize (GObject *object)
}
GtkStyleSet *
+gtk_style_set_get_style (GtkStyleProvider *provider)
+{
+ /* Return style set itself */
+ return g_object_ref (provider);
+}
+
+static void
+gtk_style_set_provider_init (GtkStyleProviderIface *iface)
+{
+ iface->get_style = gtk_style_set_get_style;
+}
+
+
+GtkStyleSet *
gtk_style_set_new (void)
{
return g_object_new (GTK_TYPE_STYLE_SET, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]