diff options
| -rw-r--r-- | ccss-gtk/ccss-gtk-stylesheet.c | 4 | ||||
| -rw-r--r-- | ccss/ccss-node.c | 32 | ||||
| -rw-r--r-- | ccss/ccss-node.h | 4 | ||||
| -rw-r--r-- | configure.in | 5 |
4 files changed, 6 insertions, 39 deletions
diff --git a/ccss-gtk/ccss-gtk-stylesheet.c b/ccss-gtk/ccss-gtk-stylesheet.c index 5b8a8a0..b13562f 100644 --- a/ccss-gtk/ccss-gtk-stylesheet.c +++ b/ccss-gtk/ccss-gtk-stylesheet.c @@ -211,12 +211,12 @@ accumulate_state (ccss_stylesheet_t *stylesheet, char *color; gboolean ret; - ccss_node_init ((ccss_node_t *) &node, &_node_class); + ccss_node_init (&node.parent, &_node_class); node.type_name = type_name; node.id = NULL; node.pseudo_class = state_name; - style = ccss_stylesheet_query (stylesheet, (ccss_node_t const *) &node); + style = ccss_stylesheet_query (stylesheet, &node.parent); if (!style) { return false; } diff --git a/ccss/ccss-node.c b/ccss/ccss-node.c index a30780d..1eb0973 100644 --- a/ccss/ccss-node.c +++ b/ccss/ccss-node.c @@ -186,13 +186,6 @@ ccss_node_get_container (ccss_node_t *self) g_return_val_if_fail (self->node_class->get_container, NULL); return self->node_class->get_container (self); - -/* We might cache this too in the future. - if (NULL == self->container) - self->container = self->node_class->get_container (self); - - return self->container; -*/ } ccss_node_t * @@ -203,13 +196,6 @@ ccss_node_get_base_style (ccss_node_t *self) g_return_val_if_fail (self->node_class->get_base_style, NULL); return self->node_class->get_base_style (self); - -/* We might cache this too in the future. - if (NULL == self->base_style) - self->base_style = self->node_class->get_base_style (self); - - return self->base_style; -*/ } char const * @@ -219,8 +205,6 @@ ccss_node_get_type (ccss_node_t *self) g_return_val_if_fail (self->node_class, NULL); g_return_val_if_fail (self->node_class->get_type, NULL); -return self->node_class->get_type (self); - if (NULL == self->type_name) self->type_name = self->node_class->get_type (self); @@ -234,8 +218,6 @@ ccss_node_get_instance (ccss_node_t *self) g_return_val_if_fail (self->node_class, 0); g_return_val_if_fail (self->node_class->get_instance, 0); -return self->node_class->get_instance (self); - if (0 == self->instance) self->instance = self->node_class->get_instance (self); @@ -249,8 +231,6 @@ ccss_node_get_id (ccss_node_t *self) g_return_val_if_fail (self->node_class, NULL); g_return_val_if_fail (self->node_class->get_id, NULL); -return self->node_class->get_id (self); - if (NULL == self->id) self->id = self->node_class->get_id (self); @@ -264,8 +244,6 @@ ccss_node_get_class (ccss_node_t *self) g_return_val_if_fail (self->node_class, NULL); g_return_val_if_fail (self->node_class->get_class, NULL); -return self->node_class->get_class (self); - if (NULL == self->css_class) self->css_class = self->node_class->get_class (self); @@ -279,8 +257,6 @@ ccss_node_get_pseudo_class (ccss_node_t *self) g_return_val_if_fail (self->node_class, NULL); g_return_val_if_fail (self->node_class->get_pseudo_class, NULL); -return self->node_class->get_pseudo_class (self); - if (NULL == self->pseudo_class) self->pseudo_class = self->node_class->get_pseudo_class (self); @@ -305,8 +281,6 @@ ccss_node_get_style (ccss_node_t *self) g_return_val_if_fail (self->node_class, NULL); g_return_val_if_fail (self->node_class->get_style, NULL); -return self->node_class->get_style (self); - if (NULL == self->inline_style) self->inline_style = self->node_class->get_style (self); @@ -320,9 +294,9 @@ ccss_node_get_viewport (ccss_node_t const *self, uint32_t *width, uint32_t *height) { - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (self->node_class, NULL); - g_return_val_if_fail (self->node_class->get_viewport, NULL); + g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (self->node_class, FALSE); + g_return_val_if_fail (self->node_class->get_viewport, FALSE); return self->node_class->get_viewport (self, x, y, width, height); } diff --git a/ccss/ccss-node.h b/ccss/ccss-node.h index c692a06..1a77eeb 100644 --- a/ccss/ccss-node.h +++ b/ccss/ccss-node.h @@ -213,10 +213,6 @@ struct ccss_node_ { /*< private >*/ ccss_node_class_t const *node_class; -/* We might cache those too in the future. - ccss_node_t *container; - ccss_node_t *base_style; -*/ ptrdiff_t instance; char const *id; char const *type_name; diff --git a/configure.in b/configure.in index 7f92f60..377ca66 100644 --- a/configure.in +++ b/configure.in @@ -9,10 +9,7 @@ AC_PREREQ(2.54) m4_define([ccss_version_major], [0]) m4_define([ccss_version_minor], [3]) m4_define([ccss_version_micro], [0]) -### For the release: -#m4_define([ccss_version_extra], []) -### On trunk: -m4_define([ccss_version_extra], [.trunk]) +m4_define([ccss_version_extra], []) m4_define([ccss_version], [ccss_version_major.ccss_version_minor.ccss_version_micro[]ccss_version_extra]) |