Various changes for orphans and widows properties:

 + Keep as int internally, rather than css_fixed.
 + Fix get_widows to return widows instead of orphans.
 + Remove duplicate implementations in css_computed_ getters.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/select/properties/orphans.c b/src/select/properties/orphans.c
index 265c6f5..d5c4937 100644
--- a/src/select/properties/orphans.c
+++ b/src/select/properties/orphans.c
@@ -23,19 +23,19 @@ css_error css__cascade_orphans(uint32_t opv, css_style *style,
 css_error css__set_orphans_from_hint(const css_hint *hint,
 		css_computed_style *style)
 {
-	return set_orphans(style, hint->status, hint->data.fixed);
+	return set_orphans(style, hint->status, hint->data.integer);
 }
 
 css_error css__initial_orphans(css_select_state *state)
 {
-	return set_orphans(state->computed, CSS_ORPHANS_SET, INTTOFIX(2));
+	return set_orphans(state->computed, CSS_ORPHANS_SET, 2);
 }
 
 css_error css__compose_orphans(const css_computed_style *parent,
 		const css_computed_style *child,
 		css_computed_style *result)
 {
-	css_fixed count = 0;
+	int32_t count = 0;
 	uint8_t type = get_orphans(child, &count);
 	
 	if (type == CSS_ORPHANS_INHERIT) {
diff --git a/src/select/properties/windows.c b/src/select/properties/windows.c
index 3f568cb..916966a 100644
--- a/src/select/properties/windows.c
+++ b/src/select/properties/windows.c
@@ -23,19 +23,19 @@ css_error css__cascade_widows(uint32_t opv, css_style *style,
 css_error css__set_widows_from_hint(const css_hint *hint,
 		css_computed_style *style)
 {
-	return set_widows(style, hint->status, hint->data.fixed);
+	return set_widows(style, hint->status, hint->data.integer);
 }
 
 css_error css__initial_widows(css_select_state *state)
 {
-	return set_widows(state->computed, CSS_WIDOWS_SET, INTTOFIX(2));
+	return set_widows(state->computed, CSS_WIDOWS_SET, 2);
 }
 
 css_error css__compose_widows(const css_computed_style *parent,
 		const css_computed_style *child,
 		css_computed_style *result)
 {
-	css_fixed count = 0;
+	int32_t count = 0;
 	uint8_t type = get_widows(child, &count);
 	
 	if (type == CSS_WIDOWS_INHERIT) {