[gtk+/wip/css: 100/154] stylecontext: Remove GtkStylePropertyContext from pack funcs
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/css: 100/154] stylecontext: Remove GtkStylePropertyContext from pack funcs
- Date: Sat, 7 Jan 2012 02:29:30 +0000 (UTC)
commit ac4a6efb49745d035e9839000721ff0e86e5ccfb
Author: Benjamin Otte <otte redhat com>
Date: Mon Jan 2 18:39:03 2012 +0100
stylecontext: Remove GtkStylePropertyContext from pack funcs
gtk/gtkcssshorthandproperty.c | 2 +-
gtk/gtkcssshorthandpropertyimpl.c | 18 ++++++------------
gtk/gtkstylepropertyprivate.h | 3 +--
3 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index 8258c00..d5a9005 100644
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -91,7 +91,7 @@ _gtk_css_shorthand_property_query (GtkStyleProperty *property,
GtkStylePropertyContext *context,
GValue *value)
{
- property->pack_func (value, props, state, context);
+ property->pack_func (value, props, state);
}
static gboolean
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index 4afa2ee..a977971 100644
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -335,8 +335,7 @@ unpack_border_width (const GValue *value,
static void
pack_border_width (GValue *value,
GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context)
+ GtkStateFlags state)
{
pack_border (value, props, state,
"border-top-width", "border-left-width",
@@ -355,8 +354,7 @@ unpack_padding (const GValue *value,
static void
pack_padding (GValue *value,
GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context)
+ GtkStateFlags state)
{
pack_border (value, props, state,
"padding-top", "padding-left",
@@ -375,8 +373,7 @@ unpack_margin (const GValue *value,
static void
pack_margin (GValue *value,
GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context)
+ GtkStateFlags state)
{
pack_border (value, props, state,
"margin-top", "margin-left",
@@ -412,8 +409,7 @@ unpack_border_radius (const GValue *value,
static void
pack_border_radius (GValue *value,
GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context)
+ GtkStateFlags state)
{
GtkCssBorderCornerRadius *top_left;
@@ -513,8 +509,7 @@ unpack_font_description (const GValue *value,
static void
pack_font_description (GValue *value,
GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context)
+ GtkStateFlags state)
{
PangoFontDescription *description;
char **families;
@@ -592,8 +587,7 @@ unpack_border_color (const GValue *value,
static void
pack_border_color (GValue *value,
GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context)
+ GtkStateFlags state)
{
/* NB: We are a color property, so we have to resolve to a color here.
* So we just resolve to a color. We pick one and stick to it.
diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 92cfb07..3d72fac 100644
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -43,8 +43,7 @@ typedef GParameter * (* GtkStyleUnpackFunc) (const GValue
guint *n_params);
typedef void (* GtkStylePackFunc) (GValue *value,
GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context);
+ GtkStateFlags state);
struct _GtkStyleProperty
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]