Commit a4aae952 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg
Browse files

Fix some bugs in the previous edit changes.

2000-01-29  Jody Goldberg <jgoldberg@home.com>

	* src/sheet.c (sheet_accept_pending_input) : Use
	  gnumeric_sheet_destroy_editing_cursor.

	* src/workbook.c (workbook_realized) : Delete unused function.
	(accept_input) : Force the sheet into edit mode when a user activates
	  the edit bar.
parent c668b718
2000-01-29 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_accept_pending_input) : Use
gnumeric_sheet_destroy_editing_cursor.
* src/xml-io.c (gnumeric_xml_read_workbook) : Really return 0 on
success.
* src/workbook.c (workbook_realized) : Delete unused function.
(accept_input) : Force the sheet into edit mode when a user activates
the edit bar.
2000-01-30 Jon K Hellan <hellan@acm.org>
* src/xml-io.h (gnumeric_xml_read_workbook): Return int
......
2000-01-29 Jody Goldberg <jgoldberg@home.com>
* src/sheet.c (sheet_accept_pending_input) : Use
gnumeric_sheet_destroy_editing_cursor.
* src/xml-io.c (gnumeric_xml_read_workbook) : Really return 0 on
success.
* src/workbook.c (workbook_realized) : Delete unused function.
(accept_input) : Force the sheet into edit mode when a user activates
the edit bar.
2000-01-30 Jon K Hellan <hellan@acm.org>
* src/xml-io.h (gnumeric_xml_read_workbook): Return int
......
......@@ -1337,6 +1337,17 @@ sheet_accept_pending_input (Sheet *sheet)
return;
sheet_stop_editing (sheet);
/*
* If user was editing on the input line, get the focus back
*/
workbook_focus_current_sheet (sheet->workbook);
for (l = sheet->sheet_views; l; l = l->next){
GnumericSheet *gsheet = GNUMERIC_SHEET_VIEW (l->data);
gnumeric_sheet_destroy_editing_cursor (gsheet);
}
str = gtk_entry_get_text (GTK_ENTRY (sheet->workbook->ea_input));
g_return_if_fail (str != NULL);
......@@ -1357,17 +1368,6 @@ sheet_accept_pending_input (Sheet *sheet)
if (!cmd_set_text (NULL, sheet, &r.start, str))
sheet_set_text (sheet, str, &r);
/*
* If user was editing on the input line, get the focus back
*/
workbook_focus_current_sheet (sheet->workbook);
for (l = sheet->sheet_views; l; l = l->next){
GnumericSheet *gsheet = GNUMERIC_SHEET_VIEW (l->data);
gnumeric_sheet_stop_editing (gsheet);
}
workbook_recalc (sheet->workbook);
}
......
......@@ -180,12 +180,6 @@ void workbook_expr_unrelocate_free(GSList *info);
void workbook_recalc (Workbook *wb);
void workbook_recalc_all (Workbook *wb);
/*
* Callback routine: invoked when the first view ItemGrid
* is realized to allocate the default styles
*/
void workbook_realized (Workbook *, GdkWindow *);
typedef gboolean (*WorkbookCallback)(Workbook *, gpointer data);
void workbook_foreach (WorkbookCallback cback,
......
......@@ -615,6 +615,9 @@ static void
accept_input (GtkWidget *IGNORED, Workbook *wb)
{
Sheet *sheet = wb->current_sheet;
/* Force sheet into edit mode */
sheet->editing = TRUE;
sheet_accept_pending_input (sheet);
workbook_focus_current_sheet (wb);
}
......@@ -2701,15 +2704,6 @@ workbook_new_with_sheets (int sheet_count)
return wb;
}
/*
* This routine sets up the default styles for the
* workbook
*/
void
workbook_realized (Workbook *workbook, GdkWindow *window)
{
}
/**
* workbook_set_filename:
* @wb: the workbook to modify
......
......@@ -180,12 +180,6 @@ void workbook_expr_unrelocate_free(GSList *info);
void workbook_recalc (Workbook *wb);
void workbook_recalc_all (Workbook *wb);
/*
* Callback routine: invoked when the first view ItemGrid
* is realized to allocate the default styles
*/
void workbook_realized (Workbook *, GdkWindow *);
typedef gboolean (*WorkbookCallback)(Workbook *, gpointer data);
void workbook_foreach (WorkbookCallback cback,
......
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