NULL
};
-
object_type = g_type_register_static (G_TYPE_PSPPIRE_AXIS,
"PsppireAxisImpl",
&object_info, 0);
-
g_type_add_interface_static (object_type,
PSPPIRE_TYPE_AXIS_IFACE,
&interface_info);
g_return_if_fail (n_units > 0);
- node = pool_alloc (a->pool, sizeof *node);
+ node = pool_malloc (a->pool, sizeof *node);
tower_insert (&a->unit_tower, n_units, &node->unit_node, NULL);
tower_insert (&a->pixel_tower, size * n_units, &node->pixel_node, NULL);
fraction = (posn - start) / (gfloat) existing_unit_size;
- new_node = pool_alloc (a->pool, sizeof (*new_node));
+ new_node = pool_malloc (a->pool, sizeof (*new_node));
tower_resize (&a->unit_tower, &existing_node->unit_node, posn - start);
struct axis_node *before = NULL;
struct axis_node *new_node;
- g_return_if_fail ( posn < tower_height (&a->unit_tower));
g_return_if_fail ( posn >= 0);
+ g_return_if_fail ( posn <= tower_height (&a->unit_tower));
- new_node = pool_alloc (a->pool, sizeof (*new_node));
-
- if ( posn > 0)
+ if ( posn < tower_height (&a->unit_tower))
{
unsigned long int start = 0;
struct tower_node *n;
before = tower_data (n, struct axis_node, unit_node);
}
+ new_node = pool_malloc (a->pool, sizeof (*new_node));
+
tower_insert (&a->unit_tower,
1,
&new_node->unit_node,
before ? &before->unit_node : NULL);
-
tower_insert (&a->pixel_tower,
size,
&new_node->pixel_node,
g_assert (1 == tower_node_get_size (n));
-
return tower_data (n, struct axis_node, unit_node);
}
+
static void
resize (PsppireAxis *axis, gint posn, glong size)
{
struct axis_node *an;
g_return_if_fail (posn >= 0);
+ g_return_if_fail (size > 0);
/* Silently ignore this request if the position is greater than the number of
units in the axis */
{
gint units_to_delete = n_units;
unsigned long int start;
+ struct tower_node *unit_node ;
g_return_if_fail (first + n_units < tower_height (&a->unit_tower));
split (a, first);
split (a, first + n_units);
- struct tower_node *unit_node = tower_lookup (&a->unit_tower, first, &start);
+ unit_node = tower_lookup (&a->unit_tower, first, &start);
g_assert (start == first);
while (units_to_delete > 0)
tower_delete (&a->unit_tower, unit_node);
tower_delete (&a->pixel_tower, &an->pixel_node);
+ pool_free (a->pool, an);
unit_node = next_unit_node;
}