#include "data/file-handle-def.h"
#include "data/dataset.h"
#include "libpspp/version.h"
-#include "output/group-item.h"
+#include "output/output-item.h"
#include "output/pivot-table.h"
#include "output/spv/spv.h"
#include "output/spv/spv-output.h"
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("If you don't save, changes from the last %ld seconds will be permanently lost."),
- timespan / G_TIME_SPAN_SECOND);
+ (long int) (timespan / G_TIME_SPAN_SECOND));
gtk_dialog_add_button (GTK_DIALOG (dialog),
_("Close _without saving"),
break;
for (size_t i = common; i < old_path.n; i++)
- group_close_item_submit (group_close_item_create ());
+ output_item_submit (group_close_item_create ());
for (size_t i = common; i < new_path.n; i++)
- group_open_item_submit (group_open_item_create (
- new_path.nodes[i]->command_id));
+ output_item_submit (group_open_item_create (
+ new_path.nodes[i]->command_id,
+ new_path.nodes[i]->label));
free_path (&old_path);
free_path (&new_path);
if (items[i]->type == SPV_ITEM_TEXT)
spv_text_submit (items[i]);
else if (items[i]->type == SPV_ITEM_TABLE)
- pivot_table_submit (spv_item_get_table (items[i]));
+ pivot_table_submit (pivot_table_ref (spv_item_get_table (items[i])));
+ else if (items[i]->type == SPV_ITEM_IMAGE)
+ {
+ cairo_surface_t *image = spv_item_get_image (items[i]);
+ output_item_submit (image_item_create (cairo_surface_reference (
+ image)));
+ }
prev_heading = heading;
}
dump_heading_transition (prev_heading, spv_get_root (spv));