[border] Deprecate struct fields.

7 files changed, 89 insertions, 14 deletions

diff --git a/ccss-cairo/ccss-cairo-border-image.c b/ccss-cairo/ccss-cairo-border-image.c
index d928c01..ef3b44b 100644
--- a/ccss-cairo/ccss-cairo-border-image.c
+++ b/ccss-cairo/ccss-cairo-border-image.c
@@ -19,6 +19,9 @@
  * MA 02110-1301, USA.
  */
 
+/* Direct access to struct members for fun and profit. */
+#include <ccss/ccss-macros.h>
+
 #include "ccss-cairo-border-image.h"
 #include "ccss-cairo-image-cache.h"
 #include "config.h"
diff --git a/ccss-cairo/ccss-cairo-border.h b/ccss-cairo/ccss-cairo-border.h
index c2d06b4..b1aa928 100644
--- a/ccss-cairo/ccss-cairo-border.h
+++ b/ccss-cairo/ccss-cairo-border.h
@@ -34,6 +34,12 @@
 
 CCSS_BEGIN_DECLS
 
+typedef struct {
+	ccss_color_t const *		color;
+	ccss_border_style_t const *	style;
+	ccss_border_width_t const *	width;
+} ccss_border_stroke_t;
+
 void
 ccss_cairo_border_clamp_radii (double     x,
 			       double     y, 
diff --git a/ccss-cairo/ccss-cairo-style.c b/ccss-cairo/ccss-cairo-style.c
index d9e47ca..58cbda1 100644
--- a/ccss-cairo/ccss-cairo-style.c
+++ b/ccss-cairo/ccss-cairo-style.c
@@ -737,7 +737,7 @@ ccss_cairo_style_get_string (ccss_style_t const	 *self,
  * ccss_cairo_style_get_property:
  * @self:		a #ccss_style_t.
  * @property_name:	name of the property.
- * @value:		location to store the property.
+ * @property:		location to store the property.
  * 
  * Query a custom property with fallbacks, e.g. `border-color' if `border-left-color' is not given.
  *
diff --git a/ccss/Makefile.am b/ccss/Makefile.am
index f42a7dd..13166bd 100644
--- a/ccss/Makefile.am
+++ b/ccss/Makefile.am
@@ -30,6 +30,7 @@ libccss_1_la_SOURCES = \
 	ccss-background-parser.h \
 	ccss-block.c \
 	ccss-block-priv.h \
+	ccss-border.c \
 	ccss-border-parser.c \
 	ccss-border-parser.h \
 	ccss-border-image.c \
diff --git a/ccss/ccss-border.c b/ccss/ccss-border.c
new file mode 100644
index 0000000..57063d7
--- /dev/null
+++ b/ccss/ccss-border.c
@@ -0,0 +1,57 @@
+/* vim: set ts=8 sw=8 noexpandtab: */
+
+/* The `C' CSS Library.
+ * Copyright (C) 2008 Robert Staudinger
+ * Copyright (C) 2009 Intel Corporation.
+ *
+ * This  library is free  software; you can  redistribute it and/or
+ * modify it  under  the terms  of the  GNU Lesser  General  Public
+ * License  as published  by the Free  Software  Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed  in the hope that it will be useful,
+ * but  WITHOUT ANY WARRANTY; without even  the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * 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., 51  Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <glib.h>
+#include "ccss-border.h"
+
+ccss_border_style_type_t
+ccss_border_style_get_style (ccss_border_style_t const *self)
+{
+	g_return_val_if_fail (self, 0);
+
+	return self->style;
+}
+
+double
+ccss_border_width_get_width (ccss_border_width_t const *self)
+{
+	g_return_val_if_fail (self, 0);
+
+	return self->width;
+}
+
+double
+ccss_border_spacing_get_spacing (ccss_border_spacing_t const *self)
+{
+	g_return_val_if_fail (self, 0);
+
+	return self->width;
+}
+
+double
+ccss_border_join_get_radius (ccss_border_join_t const *self)
+{
+	g_return_val_if_fail (self, 0);
+
+	return self->radius;
+}
+
diff --git a/ccss/ccss-border.h b/ccss/ccss-border.h
index 52116d7..e462b63 100644
--- a/ccss/ccss-border.h
+++ b/ccss/ccss-border.h
@@ -23,8 +23,6 @@
 #ifndef CCSS_BORDER_H
 #define CCSS_BORDER_H
 
-#include <stdbool.h>
-#include <stdint.h>
 #include <ccss/ccss-color.h>
 #include <ccss/ccss-macros.h>
 
@@ -57,32 +55,38 @@ typedef enum {
 } ccss_border_drawing_flags_t;
 
 typedef struct {
-	ccss_property_t			base;
+	CCSS_DEPRECATED (ccss_property_t		base);
 
-	ccss_border_style_type_t	style;
+	CCSS_DEPRECATED (ccss_border_style_type_t	style);
 } ccss_border_style_t;
 
+ccss_border_style_type_t
+ccss_border_style_get_style (ccss_border_style_t const *self);
+
 typedef struct {
-	ccss_property_t			base;
+	CCSS_DEPRECATED (ccss_property_t	base);
 
-	double				width;
+	CCSS_DEPRECATED (double			width);
 } ccss_border_width_t;
 
+double
+ccss_border_width_get_width (ccss_border_width_t const *self);
+
 /* FIXME: introduce generic "double" value struct. */
 typedef ccss_border_width_t ccss_border_spacing_t;
 
-typedef struct {
-	ccss_color_t const *		color;
-	ccss_border_style_t const *	style;
-	ccss_border_width_t const *	width;
-} ccss_border_stroke_t; 
+double
+ccss_border_spacing_get_spacing (ccss_border_spacing_t const *self);
 
 typedef struct {
-	ccss_property_t			base;
+	CCSS_DEPRECATED (ccss_property_t	base);
 
-	double				radius;
+	CCSS_DEPRECATED (double			radius);
 } ccss_border_join_t;	/* FIXME: rename to `border-radius'? */
 
+double
+ccss_border_join_get_radius (ccss_border_join_t const *self);
+
 CCSS_END_DECLS
 
 #endif /* CCSS_BORDER_H */
diff --git a/ccss/ccss.sym b/ccss/ccss.sym
index 73d243d..2fe74ec 100644
--- a/ccss/ccss.sym
+++ b/ccss/ccss.sym
@@ -6,6 +6,10 @@ ccss_border_image_get_right
 ccss_border_image_get_uri
 ccss_border_image_get_top
 ccss_border_image_get_top_middle_bottom_horizontal_tiling
+ccss_border_join_get_radius
+ccss_border_spacing_get_spacing
+ccss_border_style_get_style
+ccss_border_width_get_width
 ccss_color_get_alpha
 ccss_color_get_blue
 ccss_color_get_green