\n");
for (r = 0 ; r < case_cnt ; ++r )
{
int c;
- struct ccase cc;
- if ( ! casereader_peek (clip_datasheet, r, &cc))
+ struct ccase *cc = casereader_peek (clip_datasheet, r);
+ if (cc == NULL)
{
g_warning ("Clipboard seems to have inexplicably shrunk");
break;
@@ -1468,13 +1759,13 @@ clip_to_html (void)
{
const struct variable *v = dict_get_var (clip_dict, c);
g_string_append (string, "");
- data_out_g_string (string, v, &cc);
+ data_out_g_string (string, v, cc);
g_string_append (string, " | \n");
}
g_string_append (string, "\n");
- case_destroy (&cc);
+ case_unref (cc);
}
g_string_append (string, "
\n");
@@ -1535,7 +1826,7 @@ static const GtkTargetEntry targets[] = {
static void
-data_sheet_update_clipboard (GtkSheet *sheet)
+data_sheet_update_clipboard (PsppireSheet *sheet)
{
GtkClipboard *clipboard =
gtk_widget_get_clipboard (GTK_WIDGET (sheet),
@@ -1572,7 +1863,7 @@ data_sheet_contents_received_callback (GtkClipboard *clipboard,
c = (char *) sd->data;
/* Paste text to selected position */
- gtk_sheet_get_active_cell (GTK_SHEET (data_editor->data_sheet[0]),
+ psppire_sheet_get_active_cell (PSPPIRE_SHEET (data_editor->data_sheet[0]),
&row, &column);
g_return_if_fail (row >= 0);
@@ -1635,5 +1926,3 @@ on_owner_change (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer data)
g_signal_emit (de, data_editor_signals[DATA_AVAILABLE_CHANGED], 0,
compatible_target);
}
-
-