diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-12-09 17:55:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-12-09 17:55:58 +0000 |
| commit | 788bec83843059493bd6f3adac26cf8e2f323559 (patch) | |
| tree | 2ead700e3571f4f545e7352baef01436238cbd43 /gtk/gtkcellrenderercombo.c | |
| parent | 08b5b675e157305696094e334d7e4c5c3fb1f5a4 (diff) | |
| download | gtk+-788bec83843059493bd6f3adac26cf8e2f323559.tar.gz | |
Fix #145463, reported by Michael Natterer.
2004-12-09 Matthias Clasen <mclasen@redhat.com>
Fix #145463, reported by Michael Natterer.
* gtk/gtkcellrenderer.h (struct _GtkCellRenderer): Add an
editing flag to keep track of when editing is done.
* gtk/gtkcellrenderer.h:
* gtk/gtkcellrenderer.c (gtk_cell_renderer_stop_editing): New
function to replace gtk_cell_renderer_editing_canceled().
Deprecate gtk_cell_renderer_editing_canceled().
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_editing_done):
* gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_editing_done):
* gtk/gtktreeview.c (gtk_tree_view_stop_editing):
Use gtk_cell_renderer_stop_editing().
Diffstat (limited to 'gtk/gtkcellrenderercombo.c')
| -rw-r--r-- | gtk/gtkcellrenderercombo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c index 8b26a8d555..1f027468d0 100644 --- a/gtk/gtkcellrenderercombo.c +++ b/gtk/gtkcellrenderercombo.c @@ -254,6 +254,7 @@ gtk_cell_renderer_combo_editing_done (GtkCellEditable *combo, GtkTreeIter iter; GtkCellRendererCombo *cell; GtkEntry *entry; + gboolean canceled; cell = GTK_CELL_RENDERER_COMBO (data); @@ -262,12 +263,11 @@ gtk_cell_renderer_combo_editing_done (GtkCellEditable *combo, g_signal_handler_disconnect (combo, cell->focus_out_id); cell->focus_out_id = 0; } - - if (_gtk_combo_box_editing_canceled (GTK_COMBO_BOX (combo))) - { - gtk_cell_renderer_editing_canceled (GTK_CELL_RENDERER (data)); - return; - } + + canceled = _gtk_combo_box_editing_canceled (GTK_COMBO_BOX (combo)); + gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (data), canceled); + if (canceled) + return; if (GTK_IS_COMBO_BOX_ENTRY (combo)) { |