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

new virtual (workbook_control_gui_ctor_class) : connect it here.


2001-04-15  Jody Goldberg <jgoldberg@home.com>

	* src/workbook-control-gui.c (wbcg_finish_editing) : new virtual
	(workbook_control_gui_ctor_class) : connect it here.
	(wbcg_sheet_remove_all) : be sure we are no longer editing.

	* src/workbook-control-priv.h : new virtual.
	* src/workbook-control.c : ditto.
	* src/workbook-control.h : ditto.

	* src/colrow.c (colrow_visibility) : One last potential NULL.

	* src/graph-vector.c : some portability fixes.
parent fb8065fe
......@@ -8,8 +8,6 @@ release, and longer term bugs.
Release Critical
----------------
- finish rename gnumeric.xml
- defining file patterns in plugin spec overrides 'has_probe' flag silently.
- pasting with singleton destination circumvents checks for arrays and
......
2001-04-15 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (wbcg_finish_editing) : new virtual
(workbook_control_gui_ctor_class) : connect it here.
(wbcg_sheet_remove_all) : be sure we are no longer editing.
* src/workbook-control-priv.h : new virtual.
* src/workbook-control.c : ditto.
* src/workbook-control.h : ditto.
* src/colrow.c (colrow_visibility) : One last potential NULL.
* src/graph-vector.c : some portability fixes.
2001-04-15 Almer S. Tigelaar <almer@gnome.org>
* src/parser.y : Add detailed parser error messages.
......
2001-04-15 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (wbcg_finish_editing) : new virtual
(workbook_control_gui_ctor_class) : connect it here.
(wbcg_sheet_remove_all) : be sure we are no longer editing.
* src/workbook-control-priv.h : new virtual.
* src/workbook-control.c : ditto.
* src/workbook-control.h : ditto.
* src/colrow.c (colrow_visibility) : One last potential NULL.
* src/graph-vector.c : some portability fixes.
2001-04-15 Almer S. Tigelaar <almer@gnome.org>
* src/parser.y : Add detailed parser error messages.
......
2001-04-15 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (wbcg_finish_editing) : new virtual
(workbook_control_gui_ctor_class) : connect it here.
(wbcg_sheet_remove_all) : be sure we are no longer editing.
* src/workbook-control-priv.h : new virtual.
* src/workbook-control.c : ditto.
* src/workbook-control.h : ditto.
* src/colrow.c (colrow_visibility) : One last potential NULL.
* src/graph-vector.c : some portability fixes.
2001-04-15 Almer S. Tigelaar <almer@gnome.org>
* src/parser.y : Add detailed parser error messages.
......
2001-04-15 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (wbcg_finish_editing) : new virtual
(workbook_control_gui_ctor_class) : connect it here.
(wbcg_sheet_remove_all) : be sure we are no longer editing.
* src/workbook-control-priv.h : new virtual.
* src/workbook-control.c : ditto.
* src/workbook-control.h : ditto.
* src/colrow.c (colrow_visibility) : One last potential NULL.
* src/graph-vector.c : some portability fixes.
2001-04-15 Almer S. Tigelaar <almer@gnome.org>
* src/parser.y : Add detailed parser error messages.
......
2001-04-15 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (wbcg_finish_editing) : new virtual
(workbook_control_gui_ctor_class) : connect it here.
(wbcg_sheet_remove_all) : be sure we are no longer editing.
* src/workbook-control-priv.h : new virtual.
* src/workbook-control.c : ditto.
* src/workbook-control.h : ditto.
* src/colrow.c (colrow_visibility) : One last potential NULL.
* src/graph-vector.c : some portability fixes.
2001-04-15 Almer S. Tigelaar <almer@gnome.org>
* src/parser.y : Add detailed parser error messages.
......
......@@ -465,7 +465,7 @@ colrow_visibility (Sheet const *sheet, struct colrow_visiblity * const dat,
dat->elements = g_slist_insert_sorted (dat->elements, res,
(GCompareFunc)colrow_index_cmp);
if (visible && cri->is_collapsed) {
if (visible && cri != NULL && cri->is_collapsed) {
i = colrow_find_outline_bound (
sheet, dat->is_cols, j,
cri->outline_level+1, FALSE);
......
......@@ -66,8 +66,8 @@ typedef struct {
#define GRAPH_VECTOR_CLASS(k) (GTK_CHECK_CLASS_CAST((k), GRAPH_VECTOR_TYPE, GraphVectorClass))
#define IS_GRAPH_VECTOR(o) (GTK_CHECK_TYPE ((o), GRAPH_VECTOR_TYPE))
#define IS_GRAPH_VECTOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GRAPH_VECTOR_TYPE))
#define DEP_TO_GRAPH_VECTOR(ptr) (GraphVector *)(((void *)ptr) - GTK_STRUCT_OFFSET(GraphVector, dep))
#define SERVANT_TO_GRAPH_VECTOR(ptr) (GraphVector *)(((void *)ptr) - GTK_STRUCT_OFFSET(GraphVector, servant))
#define DEP_TO_GRAPH_VECTOR(ptr) (GraphVector *)(((char *)ptr) - GTK_STRUCT_OFFSET(GraphVector, dep))
#define SERVANT_TO_GRAPH_VECTOR(ptr) (GraphVector *)(((char *)ptr) - GTK_STRUCT_OFFSET(GraphVector, servant))
static GtkType graph_vector_get_type (void);
......
......@@ -66,8 +66,8 @@ typedef struct {
#define GRAPH_VECTOR_CLASS(k) (GTK_CHECK_CLASS_CAST((k), GRAPH_VECTOR_TYPE, GraphVectorClass))
#define IS_GRAPH_VECTOR(o) (GTK_CHECK_TYPE ((o), GRAPH_VECTOR_TYPE))
#define IS_GRAPH_VECTOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GRAPH_VECTOR_TYPE))
#define DEP_TO_GRAPH_VECTOR(ptr) (GraphVector *)(((void *)ptr) - GTK_STRUCT_OFFSET(GraphVector, dep))
#define SERVANT_TO_GRAPH_VECTOR(ptr) (GraphVector *)(((void *)ptr) - GTK_STRUCT_OFFSET(GraphVector, servant))
#define DEP_TO_GRAPH_VECTOR(ptr) (GraphVector *)(((char *)ptr) - GTK_STRUCT_OFFSET(GraphVector, dep))
#define SERVANT_TO_GRAPH_VECTOR(ptr) (GraphVector *)(((char *)ptr) - GTK_STRUCT_OFFSET(GraphVector, servant))
static GtkType graph_vector_get_type (void);
......
......@@ -287,6 +287,11 @@ wbcg_edit_line_set (WorkbookControl *wbc, char const *text)
GtkEntry *entry = workbook_get_entry ((WorkbookControlGUI*)wbc);
gtk_entry_set_text (entry, text);
}
static void
wbcg_finish_editing (WorkbookControl *wbc, gboolean accept)
{
workbook_finish_editing ((WorkbookControlGUI*)wbc, accept);
}
static void
wbcg_edit_selection_descr_set (WorkbookControl *wbc, char const *text)
......@@ -595,6 +600,9 @@ wbcg_sheet_remove_all (WorkbookControl *wbc)
if (wbcg->notebook != NULL) {
GtkWidget *tmp = GTK_WIDGET (wbcg->notebook);
/* Be sure we are no longer editing */
workbook_finish_editing (wbcg, FALSE);
/* Clear notebook to disable updates as focus changes for pages
* during destruction
*/
......@@ -3442,6 +3450,7 @@ workbook_control_gui_ctor_class (GtkObjectClass *object_class)
wbc_class->format_feedback = wbcg_format_feedback;
wbc_class->zoom_feedback = wbcg_zoom_feedback;
wbc_class->edit_line_set = wbcg_edit_line_set;
wbc_class->finish_editing = wbcg_finish_editing;
wbc_class->selection_descr_set = wbcg_edit_selection_descr_set;
wbc_class->auto_expr_value = wbcg_auto_expr_value;
......
......@@ -21,6 +21,7 @@ typedef struct {
void (*format_feedback) (WorkbookControl *wbc);
void (*zoom_feedback) (WorkbookControl *wbc);
void (*edit_line_set) (WorkbookControl *wbc, char const *text);
void (*finish_editing) (WorkbookControl *wbc, gboolean accept);
void (*selection_descr_set) (WorkbookControl *wbc, char const *text);
void (*auto_expr_value) (WorkbookControl *wbc);
struct {
......
......@@ -66,6 +66,8 @@ WBC_VIRTUAL (zoom_feedback,
(WorkbookControl *wbc), (wbc))
WBC_VIRTUAL (edit_line_set,
(WorkbookControl *wbc, char const *text), (wbc, text))
WBC_VIRTUAL (finish_editing,
(WorkbookControl *wbc, gboolean accept), (wbc, accept))
WBC_VIRTUAL (selection_descr_set,
(WorkbookControl *wbc, char const *text), (wbc, text))
WBC_VIRTUAL (auto_expr_value, (WorkbookControl *wbc), (wbc))
......
......@@ -23,6 +23,7 @@ void wb_control_prefs_update (WorkbookControl *wbc);
void wb_control_format_feedback (WorkbookControl *wbc);
void wb_control_zoom_feedback (WorkbookControl *wbc);
void wb_control_edit_line_set (WorkbookControl *wbc, char const *text);
void wb_control_finish_editing (WorkbookControl *wbc, gboolean accept);
void wb_control_selection_descr_set (WorkbookControl *wbc, char const *text);
void wb_control_auto_expr_value (WorkbookControl *wbc);
......
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