Commit a14b823c authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

remove the debug spew. (formula_guru_arg_new) : no need to call editable

2001-10-31  Jody Goldberg <jgoldberg@home.com>

	* dialog-formula-guru.c (dialog_formula_guru) : remove the debug spew.
	(formula_guru_arg_new) : no need to call editable enters.  We do it
	  manually.

2001-10-31  Jody Goldberg <jgoldberg@home.com>

	* src/workbook-edit.c (wbcg_edit_finish) : don't remove the guru until
	  we are sure we won't need it anymore.
parent 2fdb2eb0
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* src/workbook-edit.c (wbcg_edit_finish) : don't remove the guru until
we are sure we won't need it anymore.
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-canvas.c (gnm_canvas_key_mode_sheet) : move the bounds
......
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* src/workbook-edit.c (wbcg_edit_finish) : don't remove the guru until
we are sure we won't need it anymore.
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-canvas.c (gnm_canvas_key_mode_sheet) : move the bounds
......
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* src/workbook-edit.c (wbcg_edit_finish) : don't remove the guru until
we are sure we won't need it anymore.
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-canvas.c (gnm_canvas_key_mode_sheet) : move the bounds
......
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* src/workbook-edit.c (wbcg_edit_finish) : don't remove the guru until
we are sure we won't need it anymore.
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-canvas.c (gnm_canvas_key_mode_sheet) : move the bounds
......
2001-10-31 Jody Goldberg <jgoldberg@home.com>
* dialog-formula-guru.c (dialog_formula_guru) : remove the debug spew.
(formula_guru_arg_new) : no need to call editable enters. We do it
manually.
2001-10-30 Jody Goldberg <jgoldberg@home.com>
http://bugzilla.gnome.org/show_bug.cgi?id=62211
......
......@@ -397,11 +397,8 @@ cb_formula_guru_clicked (GtkWidget *button, FormulaGuruState *state)
return;
}
/* Detach BEFORE we finish editing */
wbcg_edit_detach_guru (state->wbcg);
/* This will call destroy if things are ok */
wbcg_edit_finish (state->wbcg, button == state->ok_button);
gtk_widget_destroy (state->dialog);
}
static void
......@@ -455,8 +452,6 @@ formula_guru_arg_new (char * const name,
GTK_WIDGET (as->entry),
1, 2, row, row+1,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
gnumeric_editable_enters (GTK_WINDOW (state->dialog),
GTK_EDITABLE (as->entry));
if (as->is_optional)
label = g_strconcat ("(", txt, ")", NULL);
......@@ -757,9 +752,6 @@ dialog_formula_guru (WorkbookControlGUI *wbcg)
prefix = g_strndup (full_str, sub_str - full_str);
suffix = g_strdup (sub_str + strlen (func_str));
g_free (func_str);
puts (prefix);
puts (suffix);
}
state = g_new0 (FormulaGuruState, 1);
......
......@@ -185,16 +185,20 @@ wbcg_edit_finish (WorkbookControlGUI *wbcg, gboolean accept)
wb_control_gui_focus_cur_sheet (wbcg);
/* We may have a guru up even if we are not editing */
if (wbcg->edit_line.guru != NULL)
gtk_widget_destroy (wbcg->edit_line.guru);
/* Remove the range selection cursor if it exists */
if (NULL != wbcg->rangesel)
scg_rangesel_stop (wbcg->rangesel, !accept);
if (!wbcg->editing)
if (!wbcg->editing) {
/* We may have a guru up even if we are not editing. remove it.
* Do NOT remove until later it if we are editing, it is possible
* that we may want to continue editing.
*/
if (wbcg->edit_line.guru != NULL)
gtk_widget_destroy (wbcg->edit_line.guru);
return TRUE;
}
g_return_val_if_fail (IS_SHEET (wbcg->editing_sheet), TRUE);
......@@ -285,6 +289,8 @@ wbcg_edit_finish (WorkbookControlGUI *wbcg, gboolean accept)
wbcg->editing_sheet = NULL;
wbcg->editing_cell = NULL;
if (wbcg->edit_line.guru != NULL)
gtk_widget_destroy (wbcg->edit_line.guru);
workbook_edit_set_sensitive (wbcg, FALSE, TRUE);
/* restore focus to original sheet in case things were being selected
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment