[gtk-css-engine] Move over function hooks to ccss-gtk.
- From: Robert Staudinger <robsta src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtk-css-engine] Move over function hooks to ccss-gtk.
- Date: Wed, 17 Jun 2009 11:49:47 -0400 (EDT)
commit 4d56818cd316472488b74f3fb661b29ca2ad2d53
Author: Robert Staudinger <robsta gnome org>
Date: Wed Jun 17 17:49:34 2009 +0200
Move over function hooks to ccss-gtk.
Makefile.am | 2 +-
configure.in | 2 +-
src/Makefile.am | 4 -
src/gce-color.c | 255 ----------------------------------
src/gce-color.h | 39 -----
src/gce-functions.c | 385 ---------------------------------------------------
src/gce-functions.h | 34 -----
src/gce-rc-style.c | 2 -
src/gce-style.c | 10 +-
9 files changed, 7 insertions(+), 726 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index dd595f6..7438da4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I .
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-werror --enable-libccss
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-werror
SUBDIRS = data doc src themes
diff --git a/configure.in b/configure.in
index 429682f..8275b20 100644
--- a/configure.in
+++ b/configure.in
@@ -80,7 +80,7 @@ GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
AC_SUBST(GTK_VERSION)
# Maybe it would work with gtk+-2.8, the first sporting cairo, right?
-pkgs='libccss-gtk-1 >= 0.2'
+pkgs='libccss-gtk-1 >= 0.3.1'
AC_MSG_CHECKING([for SVG support in libccss-cairo])
with_rsvg=`$PKG_CONFIG --variable=ccss_with_rsvg libccss-cairo-1`
diff --git a/src/Makefile.am b/src/Makefile.am
index d13b1e9..1677abc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,10 +22,6 @@ libcss_la_LIBADD = \
$(GCE_LIBS)
libcss_la_SOURCES = \
- gce-color.c \
- gce-color.h \
- gce-functions.c \
- gce-functions.h \
gce-maps.c \
gce-maps.h \
gce-node.c \
diff --git a/src/gce-rc-style.c b/src/gce-rc-style.c
index e70a384..a8652df 100644
--- a/src/gce-rc-style.c
+++ b/src/gce-rc-style.c
@@ -21,7 +21,6 @@
#include <gtk/gtk.h>
#include <string.h>
-#include "gce-functions.h"
#include "gce-rc-style.h"
#include "gce-style.h"
#include "config.h"
@@ -83,7 +82,6 @@ parse_href (GtkRcStyle *rc_style,
scanner, scanner->value.v_string);
grammar = ccss_gtk_grammar_create ();
- ccss_grammar_add_functions (grammar, gce_functions_get_vtable ());
stylesheet = ccss_grammar_create_stylesheet_from_file (grammar,
gce_file, NULL);
if (stylesheet) {
diff --git a/src/gce-style.c b/src/gce-style.c
index e53bd6a..8ceee5b 100644
--- a/src/gce-style.c
+++ b/src/gce-style.c
@@ -30,7 +30,7 @@ static GtkStyleClass *gce_style_parent_class = NULL;
static void
rectangle (GceStyle *self,
- GceNode const *node,
+ GceNode *node,
GdkWindow *window,
GdkRectangle *area,
GtkWidget *widget,
@@ -46,7 +46,7 @@ rectangle (GceStyle *self,
g_return_if_fail (self);
if (node) {
- style = ccss_stylesheet_query (self->stylesheet, (ccss_node_t const *) node);
+ style = ccss_stylesheet_query (self->stylesheet, (ccss_node_t *) node);
} else if (self->selector) {
style = ccss_stylesheet_query_type (self->stylesheet, self->selector);
}
@@ -80,7 +80,7 @@ rectangle (GceStyle *self,
static void
gap (GceStyle *self,
- GceNode const *node,
+ GceNode *node,
GdkWindow *window,
GdkRectangle *area,
GtkWidget *widget,
@@ -98,7 +98,7 @@ gap (GceStyle *self,
g_return_if_fail (self);
if (node) {
- style = ccss_stylesheet_query (self->stylesheet, (ccss_node_t const *) node);
+ style = ccss_stylesheet_query (self->stylesheet, (ccss_node_t *) node);
} else if (self->selector) {
style = ccss_stylesheet_query_type (self->stylesheet, self->selector);
}
@@ -145,7 +145,7 @@ line (GceStyle *self,
g_return_if_fail (self);
if (node) {
- style = ccss_stylesheet_query (self->stylesheet, (ccss_node_t const *) node);
+ style = ccss_stylesheet_query (self->stylesheet, (ccss_node_t *) node);
} else if (self->selector) {
style = ccss_stylesheet_query_type (self->stylesheet, self->selector);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]