projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace changes only
[pspp]
/
src
/
ui
/
gui
/
text-data-import-dialog.c
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index b0f524ec6a182adc6beb376747ef6f9afbc63f25..34127492fa9393ec03a7a157342cd07d71360fd1 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-138,10
+138,6
@@
text_data_import_assistant (PsppireDataWindow *dw)
destroy_formats_page (ia);
destroy_separators_page (ia);
}
destroy_formats_page (ia);
destroy_separators_page (ia);
}
-
- destroy_assistant (ia);
- destroy_file (ia);
- free (ia);
}
/* Emits PSPP syntax to S that applies the dictionary attributes
}
/* Emits PSPP syntax to S that applies the dictionary attributes
@@
-575,8
+571,8
@@
get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
{
gint width;
g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
{
gint width;
g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
- gtk_cell_renderer_get_
size
(renderer, GTK_WIDGET (treeview),
-
NULL, NULL, NULL, &width, NULL
);
+ gtk_cell_renderer_get_
preferred_width
(renderer, GTK_WIDGET (treeview),
+
NULL, &width
);
return width;
}
return width;
}
@@
-658,8
+654,8
@@
push_watch_cursor (struct import_assistant *ia)
GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
GdkDisplay *display = gtk_widget_get_display (widget);
GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
GdkDisplay *display = gtk_widget_get_display (widget);
GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
- gdk_window_set_cursor (
widget->window
, cursor);
- g
dk_cursor
_unref (cursor);
+ gdk_window_set_cursor (
gtk_widget_get_window (widget)
, cursor);
+ g
_object
_unref (cursor);
gdk_display_flush (display);
}
}
gdk_display_flush (display);
}
}
@@
-672,6
+668,6
@@
pop_watch_cursor (struct import_assistant *ia)
if (--ia->asst.watch_cursor == 0)
{
GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
if (--ia->asst.watch_cursor == 0)
{
GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
- gdk_window_set_cursor (
widget->window
, NULL);
+ gdk_window_set_cursor (
gtk_widget_get_window (widget)
, NULL);
}
}
}
}