summaryrefslogtreecommitdiff
path: root/gtk/gtkcellrenderertext.c
diff options
context:
space:
mode:
authorJonathan Blandford <jrb@redhat.com>2001-11-14 22:52:43 +0000
committerJonathan Blandford <jrb@src.gnome.org>2001-11-14 22:52:43 +0000
commit99fea7f97610029d465f6fe37b1241e9604f35a3 (patch)
tree3cbf8de44849940103ecb2767002238801125ea2 /gtk/gtkcellrenderertext.c
parente874c4290abc9b8ab52635f93b305d645eb3c01d (diff)
downloadgtk+-99fea7f97610029d465f6fe37b1241e9604f35a3.tar.gz
Return the currently selected column when we get the column, #64380
Wed Nov 14 17:40:23 2001 Jonathan Blandford <jrb@redhat.com> * 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
Diffstat (limited to 'gtk/gtkcellrenderertext.c')
-rw-r--r--gtk/gtkcellrenderertext.c3
1 files changed, 3 insertions, 0 deletions
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));