diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2001-11-14 22:52:43 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2001-11-14 22:52:43 +0000 |
| commit | 99fea7f97610029d465f6fe37b1241e9604f35a3 (patch) | |
| tree | 3cbf8de44849940103ecb2767002238801125ea2 /gtk/gtkentry.c | |
| parent | e874c4290abc9b8ab52635f93b305d645eb3c01d (diff) | |
| download | gtk+-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/gtkentry.c')
| -rw-r--r-- | gtk/gtkentry.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index a9c21bebc3..8aed5b169c 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -910,8 +910,9 @@ gtk_entry_init (GtkEntry *entry) entry->dnd_position = -1; entry->width_chars = -1; entry->is_cell_renderer = FALSE; + entry->editing_canceled = FALSE; entry->has_frame = TRUE; - + gtk_drag_dest_set (GTK_WIDGET (entry), GTK_DEST_DEFAULT_HIGHLIGHT, target_table, G_N_ELEMENTS (target_table), @@ -1838,6 +1839,7 @@ gtk_cell_editable_key_press_event (GtkEntry *entry, { if (key_event->keyval == GDK_Escape) { + entry->editing_canceled = TRUE; gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry)); gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry)); |