From 99fea7f97610029d465f6fe37b1241e9604f35a3 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 14 Nov 2001 22:52:43 +0000 Subject: Return the currently selected column when we get the column, #64380 Wed Nov 14 17:40:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_get_expander_column): Return the currently selected column when we get the column, #64380 * gtk/gtkentry.c (gtk_cell_editable_key_press_event): Handle Esc to cancel CellRendererText editting, #63613 * gtk/gtkcellrenderertext.c: ditto * gtk/gtkcellrenderertext.h: formatting changes --- gtk/gtkcellrenderertext.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gtk/gtkcellrenderertext.c') diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 68784a2b16..62086cdd11 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1322,6 +1322,9 @@ gtk_cell_renderer_text_editing_done (GtkCellEditable *entry, const gchar *path; const gchar *new_text; + if (GTK_ENTRY (entry)->editing_canceled) + return; + path = g_object_get_data (G_OBJECT (entry), GTK_CELL_RENDERER_TEXT_PATH); new_text = gtk_entry_get_text (GTK_ENTRY (entry)); -- cgit v1.2.1