[gnumeric] Code cleanup
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Code cleanup
- Date: Thu, 26 Apr 2018 19:22:19 +0000 (UTC)
commit 819a535be13c92433c79f1bd9dfafb05fd842e78
Author: Morten Welinder <terra gnome org>
Date: Thu Apr 26 15:21:59 2018 -0400
Code cleanup
plugins/applix/applix-read.c | 2 +-
plugins/excel/ms-excel-read.c | 8 +-
plugins/excel/ms-excel-write.c | 4 +-
plugins/excel/xlsx-read.c | 10 +-
plugins/excel/xlsx-write.c | 2 +-
plugins/openoffice/openoffice-read.c | 8 +-
plugins/openoffice/openoffice-write.c | 2 +-
po-functions/POTFILES.in | 1 -
po/POTFILES.in | 1 -
src/.gitignore | 2 -
src/Makefile.am | 6 -
src/application.c | 16 ++--
src/cmd-edit.c | 4 +-
src/commands.c | 10 +-
src/dependent.c | 2 +-
src/dialogs/dialog-data-slicer.c | 2 +-
src/dialogs/dialog-search.c | 6 +-
src/dialogs/dialog-sheet-compare.c | 6 +-
src/gnm-cell-combo.c | 6 +-
src/gnm-pane.c | 4 +-
src/hlink.c | 2 +-
src/item-cursor.c | 8 +-
src/item-grid.c | 2 +-
src/position.c | 4 +-
src/selection.c | 64 +++++-----
src/sheet-control-gui.c | 38 +++---
src/sheet-merge.c | 2 +-
src/sheet-object.c | 44 ++++---
src/sheet-object.h | 2 +-
src/sheet-view.c | 220 +++++++++++++++++----------------
src/sheet-view.h | 68 +++++-----
src/sheet.c | 23 ++--
src/test-pango.c | 95 --------------
src/test.h | 13 --
src/wbc-gtk-actions.c | 12 +-
src/wbc-gtk-edit.c | 2 +-
src/wbc-gtk.c | 12 +-
src/widgets/gnumeric-expr-entry.c | 2 +-
src/workbook-control.c | 6 +-
src/workbook-view.c | 4 +-
src/workbook.c | 4 +-
src/xml-sax-read.c | 6 +-
src/xml-sax-write.c | 2 +-
43 files changed, 317 insertions(+), 420 deletions(-)
---
diff --git a/plugins/applix/applix-read.c b/plugins/applix/applix-read.c
index 606407d..5564375 100644
--- a/plugins/applix/applix-read.c
+++ b/plugins/applix/applix-read.c
@@ -1011,7 +1011,7 @@ applix_read_view (ApplixReadState *state, unsigned char *buffer)
GnmCellPos pos;
if (applix_parse_cellref (state, buffer+15, &sheet, &pos, ':') &&
valid_cellpos (sheet, &pos))
- sv_set_initial_top_left (sheet_get_view (sheet, state->wb_view),
+ gnm_sheet_view_set_initial_top_left (sheet_get_view (sheet, state->wb_view),
pos.col, pos.row);
} else if (!a_strncmp (buffer, "View Open Cell: ")) {
GnmCellPos pos;
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 1369961..6d05b38 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -5090,8 +5090,8 @@ excel_read_PANE (BiffQuery *q, ExcelReadSheet *esheet, WorkbookView *wb_view)
unfrozen.row += y;
else
rwTop = sv->initial_top_left.row;
- sv_freeze_panes (sv, &frozen, &unfrozen);
- sv_set_initial_top_left (sv, colLeft, rwTop);
+ gnm_sheet_view_freeze_panes (sv, &frozen, &unfrozen);
+ gnm_sheet_view_set_initial_top_left (sv, colLeft, rwTop);
} else {
g_warning ("EXCEL : no support for split panes yet (%s)", esheet->sheet->name_unquoted);
}
@@ -5178,11 +5178,11 @@ excel_read_WINDOW2 (BiffQuery *q, ExcelReadSheet *esheet, WorkbookView *wb_view)
/* until we import multiple views unfreeze just in case a previous view
* had frozen */
- sv_freeze_panes (sv, NULL, NULL);
+ gnm_sheet_view_freeze_panes (sv, NULL, NULL);
/* NOTE : This is top left of screen even if frozen, modify when
* we read PANE */
- sv_set_initial_top_left (sv, left_col, top_row);
+ gnm_sheet_view_set_initial_top_left (sv, left_col, top_row);
}
static void
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 71a63c2..6682223 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -811,7 +811,7 @@ excel_write_WINDOW2 (BiffPut *bp, ExcelWriteSheet *esheet, SheetView *sv)
options |= 0x0002;
if (!sheet->hide_col_header || !sheet->hide_row_header)
options |= 0x0004;
- if (sv_is_frozen (sv))
+ if (gnm_sheet_view_is_frozen (sv))
options |= 0x0108;
if (!sheet->hide_zero)
options |= 0x0010;
@@ -851,7 +851,7 @@ excel_write_WINDOW2 (BiffPut *bp, ExcelWriteSheet *esheet, SheetView *sv)
style_color_unref (sheet_auto);
style_color_unref (default_auto);
- if (sv_is_frozen (sv)) {
+ if (gnm_sheet_view_is_frozen (sv)) {
data = ms_biff_put_len_next (bp, BIFF_PANE, 10);
if (sv->unfrozen_top_left.col > 0)
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 67c1871..0bc9d5d 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -2887,10 +2887,10 @@ xlsx_CT_SheetView_begin (GsfXMLIn *xin, xmlChar const **attrs)
/* until we import multiple views unfreeze just in case a previous view
* had frozen */
- sv_freeze_panes (state->sv, NULL, NULL);
+ gnm_sheet_view_freeze_panes (state->sv, NULL, NULL);
if (topLeft.col >= 0)
- sv_set_initial_top_left (state->sv, topLeft.col, topLeft.row);
+ gnm_sheet_view_set_initial_top_left (state->sv, topLeft.col, topLeft.row);
g_object_set (state->sheet,
"text-is-rtl", rightToLeft,
"display-formulas", showFormulas,
@@ -2990,7 +2990,7 @@ xlsx_CT_Selection (GsfXMLIn *xin, xmlChar const **attrs)
sv_selection_add_range (state->sv, ptr->data);
g_free (ptr->data);
}
- sv_set_edit_pos (state->sv, &edit_pos);
+ gnm_sheet_view_set_edit_pos (state->sv, &edit_pos);
g_slist_free (accum);
}
}
@@ -3108,8 +3108,8 @@ xlsx_CT_Pane (GsfXMLIn *xin, xmlChar const **attrs)
unfrozen.row += ySplit;
else
topLeft.row = state->sv->initial_top_left.row;
- sv_freeze_panes (state->sv, &frozen, &unfrozen);
- sv_set_initial_top_left (state->sv, topLeft.col, topLeft.row);
+ gnm_sheet_view_freeze_panes (state->sv, &frozen, &unfrozen);
+ gnm_sheet_view_set_initial_top_left (state->sv, topLeft.col, topLeft.row);
}
}
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index 20d469e..0a38bdb 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -1446,7 +1446,7 @@ xlsx_write_sheet_view (GsfXMLOut *xml, SheetView const *sv)
style_color_unref (sheet_auto);
style_color_unref (default_auto);
- if (sv_is_frozen (sv)) {
+ if (gnm_sheet_view_is_frozen (sv)) {
activePane = "bottomRight"; /* h&v freeze */
gsf_xml_out_start_element (xml, "pane");
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 0396dfc..fee11b1 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -11250,7 +11250,7 @@ odf_selection_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
{
OOParseState *state = (OOParseState *)xin->user_state;
- sv_set_edit_pos (sheet_get_view (state->pos.sheet, state->wb_view), &state->pos.eval);
+ gnm_sheet_view_set_edit_pos (sheet_get_view (state->pos.sheet, state->wb_view), &state->pos.eval);
}
@@ -11511,7 +11511,7 @@ odf_apply_ooo_table_config (char const *key, GValue *val, OOParseState *state)
sv_selection_reset (sv);
sv_selection_add_range (sv, &r);
- sv_set_edit_pos
+ gnm_sheet_view_set_edit_pos
(sheet_get_view (sheet, state->wb_view),
&pos);
}
@@ -11554,7 +11554,7 @@ odf_apply_ooo_table_config (char const *key, GValue *val, OOParseState *state)
GnmCellPos fpos = {0, 0};
pos.col = hsp;
pos.row = vsp;
- sv_freeze_panes (sv, &fpos, &pos);
+ gnm_sheet_view_freeze_panes (sv, &fpos, &pos);
}
item = g_hash_table_lookup (hash, "PositionRight");
@@ -11568,7 +11568,7 @@ odf_apply_ooo_table_config (char const *key, GValue *val, OOParseState *state)
if (item != NULL && G_VALUE_HOLDS(item, G_TYPE_INT))
pos_bottom = g_value_get_int (item);
- sv_set_initial_top_left (sv, pos_left, pos_bottom);
+ gnm_sheet_view_set_initial_top_left (sv, pos_left, pos_bottom);
}
}
}
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 08fc19d..d4c7ed4 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -6200,7 +6200,7 @@ odf_write_ooo_settings (GnmOOExport *state)
odf_add_bool (state->xml, NULL, !sheet->hide_zero);
gsf_xml_out_end_element (state->xml); /* </config:config-item> */
- if (sv_is_frozen (sv)) {
+ if (gnm_sheet_view_is_frozen (sv)) {
gsf_xml_out_start_element (state->xml, CONFIG "config-item");
gsf_xml_out_add_cstr_unchecked (state->xml, CONFIG "name", "HorizontalSplitMode");
gsf_xml_out_add_cstr_unchecked (state->xml, CONFIG "type", "short");
diff --git a/po-functions/POTFILES.in b/po-functions/POTFILES.in
index 9409472..3898b47 100644
--- a/po-functions/POTFILES.in
+++ b/po-functions/POTFILES.in
@@ -291,7 +291,6 @@ src/stf-export.c
src/stf-parse.c
src/stf.c
src/style.c
-src/test-pango.c
src/tools/analysis-anova.c
src/tools/analysis-auto-expression.c
src/tools/analysis-chi-squared.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 78786d3..eefbd2e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -350,7 +350,6 @@ src/stf-export.c
src/stf-parse.c
src/stf.c
src/style.c
-src/test-pango.c
src/tools/analysis-anova.c
src/tools/analysis-auto-expression.c
src/tools/analysis-chi-squared.c
diff --git a/src/.gitignore b/src/.gitignore
index 92c4764..c7e89e8 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -27,8 +27,6 @@ sstest
sstest.exe
ssdiff
ssdiff.exe
-test-pango
-test-pango.exe
GNOME_Gnumeric-gtk.xml
libspreadsheet.def
local.def
diff --git a/src/Makefile.am b/src/Makefile.am
index a77f501..34a88c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,6 @@ noinst_HEADERS = dead-kittens.h compilation.h gnm-i18n.h
if WITH_GTK
SUBDIRS += dialogs widgets
bin_PROGRAMS += gnumeric
- check_PROGRAMS += test-pango
endif
bin_PROGRAMS += ssconvert ssindex ssgrep ssdiff
@@ -388,11 +387,6 @@ ssdiff_LDFLAGS = -export-dynamic
ssdiff_SOURCES = \
ssdiff.c
-test_pango_LDADD = $(gnumeric_LDADD)
-test_pango_LDFLAGS = -export-dynamic
-test_pango_SOURCES = \
- test-pango.c
-
if WITH_NATIVE_WIN32
gnumeric_LDADD += gnumeric_rc.o
gnumeric_LDFLAGS += -mwindows -Wl,--stack,0x4000000
diff --git a/src/application.c b/src/application.c
index c352ae9..1aed4a1 100644
--- a/src/application.c
+++ b/src/application.c
@@ -186,11 +186,11 @@ gnm_app_clipboard_clear (gboolean drop_selection)
app->clipboard_copied_contents = NULL;
}
if (app->clipboard_sheet_view != NULL) {
- sv_unant (app->clipboard_sheet_view);
+ gnm_sheet_view_unant (app->clipboard_sheet_view);
g_signal_emit (G_OBJECT (app), signals[CLIPBOARD_MODIFIED], 0);
- sv_weak_unref (&(app->clipboard_sheet_view));
+ gnm_sheet_view_weak_unref (&(app->clipboard_sheet_view));
/* Release the selection */
if (drop_selection)
@@ -214,7 +214,7 @@ gnm_app_clipboard_unant (void)
g_return_if_fail (app != NULL);
if (app->clipboard_sheet_view != NULL)
- sv_unant (app->clipboard_sheet_view);
+ gnm_sheet_view_unant (app->clipboard_sheet_view);
}
/**
@@ -244,7 +244,7 @@ gnm_app_clipboard_cut_copy (WorkbookControl *wbc, gboolean is_cut,
{
Sheet *sheet;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (area != NULL);
g_return_if_fail (app != NULL);
@@ -252,14 +252,14 @@ gnm_app_clipboard_cut_copy (WorkbookControl *wbc, gboolean is_cut,
sheet = sv_sheet (sv);
g_free (app->clipboard_cut_range);
app->clipboard_cut_range = gnm_range_dup (area);
- sv_weak_ref (sv, &(app->clipboard_sheet_view));
+ gnm_sheet_view_weak_ref (sv, &(app->clipboard_sheet_view));
if (!is_cut)
app->clipboard_copied_contents =
clipboard_copy_range (sheet, area);
if (animate_cursor) {
GList *l = g_list_append (NULL, (gpointer)area);
- sv_ant (sv, l);
+ gnm_sheet_view_ant (sv, l);
g_list_free (l);
}
@@ -284,14 +284,14 @@ void
gnm_app_clipboard_cut_copy_obj (WorkbookControl *wbc, gboolean is_cut,
SheetView *sv, GSList *objects)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (objects != NULL);
g_return_if_fail (app != NULL);
gnm_app_clipboard_clear (FALSE);
g_free (app->clipboard_cut_range);
app->clipboard_cut_range = NULL;
- sv_weak_ref (sv, &(app->clipboard_sheet_view));
+ gnm_sheet_view_weak_ref (sv, &(app->clipboard_sheet_view));
app->clipboard_copied_contents
= clipboard_copy_obj (sv_sheet (sv), objects);
if (is_cut) {
diff --git a/src/cmd-edit.c b/src/cmd-edit.c
index 1fe6a4d..692454b 100644
--- a/src/cmd-edit.c
+++ b/src/cmd-edit.c
@@ -146,7 +146,7 @@ sv_select_cur_depends (SheetView *sv)
GnmCell *cur_cell, dummy;
GList *deps = NULL, *ptr = NULL;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
cur_cell = sheet_cell_get (sv->sheet,
sv->edit_pos.col, sv->edit_pos.row);
@@ -238,7 +238,7 @@ sv_select_cur_inputs (SheetView *sv)
GSList *ranges, *ptr;
GnmEvalPos ep;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
cell = sheet_cell_get (sv->sheet,
sv->edit_pos.col, sv->edit_pos.row);
diff --git a/src/commands.c b/src/commands.c
index c11f30c..6671a6c 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -281,7 +281,7 @@ select_range (Sheet *sheet, const GnmRange *r, WorkbookControl *wbc)
sv = sheet_get_view (sheet, wb_control_view (wbc));
sv_selection_reset (sv);
sv_selection_add_range (sv, r);
- sv_make_cell_visible (sv, r->start.col, r->start.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, r->start.col, r->start.row, FALSE);
}
/*
@@ -304,7 +304,7 @@ select_selection (Sheet *sheet, GSList *selection, WorkbookControl *wbc)
sv_selection_add_range (sv, r);
r0 = r;
}
- sv_make_cell_visible (sv, r0->start.col, r0->start.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, r0->start.col, r0->start.row, FALSE);
}
/**
@@ -1388,7 +1388,7 @@ cmd_ins_del_colrow_finalize (GObject *cmd)
g_free (me->cutcopied);
- sv_weak_unref (&(me->cut_copy_view));
+ gnm_sheet_view_weak_unref (&(me->cut_copy_view));
gnm_command_finalize (cmd);
}
@@ -1441,7 +1441,7 @@ cmd_ins_del_colrow (WorkbookControl *wbc,
sheet == gnm_app_clipboard_sheet_get ()) {
me->cutcopied = gnm_range_dup (gnm_app_clipboard_area_get ());
me->is_cut = gnm_app_clipboard_is_cut ();
- sv_weak_ref (gnm_app_clipboard_sheet_view_get (),
+ gnm_sheet_view_weak_ref (gnm_app_clipboard_sheet_view_get (),
&(me->cut_copy_view));
} else
me->cutcopied = NULL;
@@ -7738,7 +7738,7 @@ gboolean
cmd_autofilter_add_remove (WorkbookControl *wbc)
{
SheetView *sv = wb_control_cur_sheet_view (wbc);
- GnmFilter *f = sv_editpos_in_filter (sv);
+ GnmFilter *f = gnm_sheet_view_editpos_in_filter (sv);
gboolean add = (f == NULL);
char *descr = NULL, *name = NULL;
GOUndo *undo = NULL;
diff --git a/src/dependent.c b/src/dependent.c
index 13d7fe3..757ff60 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -2884,7 +2884,7 @@ workbook_recalc (Workbook *wb)
*/
if (redraw) {
WORKBOOK_FOREACH_SHEET (wb, sheet, {
- SHEET_FOREACH_VIEW (sheet, sv, sv_flag_selection_change (sv););
+ SHEET_FOREACH_VIEW (sheet, sv, gnm_sheet_view_flag_selection_change (sv););
sheet_redraw_all (sheet, FALSE);});
}
}
diff --git a/src/dialogs/dialog-data-slicer.c b/src/dialogs/dialog-data-slicer.c
index a51c1c8..f628c18 100644
--- a/src/dialogs/dialog-data-slicer.c
+++ b/src/dialogs/dialog-data-slicer.c
@@ -237,7 +237,7 @@ dialog_data_slicer (WBCGtk *wbcg, gboolean create)
state->dialog = go_gtk_builder_get_widget (gui, "dialog_data_slicer");
state->notebook = go_gtk_builder_get_widget (gui, "notebook");
- state->slicer = create ? NULL : sv_editpos_in_slicer (state->sv);
+ state->slicer = create ? NULL : gnm_sheet_view_editpos_in_slicer (state->sv);
state->cache = NULL;
state->source = NULL;
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index 0022e83..9ea601b 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -295,10 +295,10 @@ cursor_change (GtkTreeView *tree_view, DialogState *dd)
if (wb_control_cur_sheet (wbc) != item->ep.sheet)
wb_view_sheet_focus (wbv, item->ep.sheet);
sv = wb_view_cur_sheet_view (wbv);
- sv_set_edit_pos (sv, &item->ep.eval);
+ gnm_sheet_view_set_edit_pos (sv, &item->ep.eval);
sv_selection_set (sv, &item->ep.eval, col, row, col, row);
- sv_make_cell_visible (sv, col, row, FALSE);
- sv_update (sv);
+ gnm_sheet_view_make_cell_visible (sv, col, row, FALSE);
+ gnm_sheet_view_update (sv);
}
}
diff --git a/src/dialogs/dialog-sheet-compare.c b/src/dialogs/dialog-sheet-compare.c
index baa7a4b..774a76c 100644
--- a/src/dialogs/dialog-sheet-compare.c
+++ b/src/dialogs/dialog-sheet-compare.c
@@ -788,10 +788,10 @@ find_and_focus (GnmRangeRef const *loc, SheetView *avoid)
if (wb_view_cur_sheet (view) != loc_sheet)
continue;
- sv_set_edit_pos (sv, &r.start);
+ gnm_sheet_view_set_edit_pos (sv, &r.start);
sv_selection_set (sv, &r.start, col, row, col, row);
- sv_make_cell_visible (sv, col, row, FALSE);
- sv_update (sv);
+ gnm_sheet_view_make_cell_visible (sv, col, row, FALSE);
+ gnm_sheet_view_update (sv);
return sv;
});
return NULL;
diff --git a/src/gnm-cell-combo.c b/src/gnm-cell-combo.c
index 6356ca0..07621fb 100644
--- a/src/gnm-cell-combo.c
+++ b/src/gnm-cell-combo.c
@@ -39,11 +39,11 @@ gnm_cell_combo_set_sv (GnmCellCombo *ccombo, SheetView *sv)
return;
if (NULL != ccombo->sv)
- sv_weak_unref (&ccombo->sv);
+ gnm_sheet_view_weak_unref (&ccombo->sv);
ccombo->sv = sv;
if (sv)
- sv_weak_ref (sv, &ccombo->sv);
+ gnm_sheet_view_weak_ref (sv, &ccombo->sv);
}
static void
@@ -119,7 +119,7 @@ gnm_cell_combo_class_init (GObjectClass *gobject_class)
g_object_class_install_property (gobject_class, PROP_SV,
g_param_spec_object ("sheet-view", NULL, NULL,
- GNM_SV_TYPE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
+ GNM_SHEET_VIEW_TYPE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
}
GSF_CLASS_ABSTRACT (GnmCellCombo, gnm_cell_combo,
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index dbb07d8..52a8e67 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -363,7 +363,7 @@ gnm_pane_key_mode_sheet (GnmPane *pane, GdkEventKey *kevent,
if (gnm_pane_guru_key (wbcg, event))
break;
if (state == GDK_CONTROL_MASK)
- sv_selection_copy (sv, GNM_WBC (wbcg));
+ gnm_sheet_view_selection_copy (sv, GNM_WBC (wbcg));
else if (state == GDK_SHIFT_MASK)
cmd_paste_to_selection (GNM_WBC (wbcg), sv, PASTE_DEFAULT);
break;
@@ -394,7 +394,7 @@ gnm_pane_key_mode_sheet (GnmPane *pane, GdkEventKey *kevent,
break;
if (state == GDK_SHIFT_MASK) {
scg_mode_edit (scg);
- sv_selection_cut (sv, GNM_WBC (wbcg));
+ gnm_sheet_view_selection_cut (sv, GNM_WBC (wbcg));
} else
cmd_selection_clear (GNM_WBC (wbcg), CLEAR_VALUES);
break;
diff --git a/src/hlink.c b/src/hlink.c
index c77b0de..d67c6ea 100644
--- a/src/hlink.c
+++ b/src/hlink.c
@@ -284,7 +284,7 @@ gnm_hlink_cur_wb_activate (GnmHLink *lnk, WBCGtk *wbcg)
sv_selection_set (sv, &sr.range.start,
sr.range.start.col, sr.range.start.row,
sr.range.end.col, sr.range.end.row);
- sv_make_cell_visible (sv, sr.range.start.col, sr.range.start.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, sr.range.start.col, sr.range.start.row, FALSE);
if (wbcg_cur_sheet (wbcg) != sr.sheet)
wb_view_sheet_focus (wb_control_view (wbc), sr.sheet);
diff --git a/src/item-cursor.c b/src/item-cursor.c
index 783e4ef..fd096ef 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -761,7 +761,7 @@ item_cursor_do_action (GnmItemCursor *ic, ActionType action)
switch (action) {
case ACTION_COPY_CELLS:
- if (!sv_selection_copy (sv, wbc))
+ if (!gnm_sheet_view_selection_copy (sv, wbc))
break;
cmd_paste (wbc,
paste_target_init (&pt, sheet, &ic->pos,
@@ -769,7 +769,7 @@ item_cursor_do_action (GnmItemCursor *ic, ActionType action)
break;
case ACTION_MOVE_CELLS:
- if (!sv_selection_cut (sv, wbc))
+ if (!gnm_sheet_view_selection_cut (sv, wbc))
break;
cmd_paste (wbc,
paste_target_init (&pt, sheet, &ic->pos,
@@ -777,7 +777,7 @@ item_cursor_do_action (GnmItemCursor *ic, ActionType action)
break;
case ACTION_COPY_FORMATS:
- if (!sv_selection_copy (sv, wbc))
+ if (!gnm_sheet_view_selection_copy (sv, wbc))
break;
cmd_paste (wbc,
paste_target_init (&pt, sheet, &ic->pos,
@@ -785,7 +785,7 @@ item_cursor_do_action (GnmItemCursor *ic, ActionType action)
break;
case ACTION_COPY_VALUES:
- if (!sv_selection_copy (sv, wbc))
+ if (!gnm_sheet_view_selection_copy (sv, wbc))
break;
cmd_paste (wbc,
paste_target_init (&pt, sheet, &ic->pos,
diff --git a/src/item-grid.c b/src/item-grid.c
index 4597316..d202c5f 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -991,7 +991,7 @@ item_grid_button_pressed (GocItem *item, int button, double x_, double y_)
(already_selected && (event->button.state & GDK_CONTROL_MASK)) ?
GNM_SELECTION_MODE_REMOVE :
GNM_SELECTION_MODE_ADD);
- sv_make_cell_visible (sv, pos.col, pos.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, pos.col, pos.row, FALSE);
} else sv_selection_extend_to (sv, pos.col, pos.row);
sheet_update (sheet);
}
diff --git a/src/position.c b/src/position.c
index a5d0714..0a5fd3c 100644
--- a/src/position.c
+++ b/src/position.c
@@ -159,7 +159,7 @@ GnmEvalPos *
eval_pos_init_editpos (GnmEvalPos *ep, SheetView const *sv)
{
g_return_val_if_fail (ep != NULL, NULL);
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
return eval_pos_init (ep, sv_sheet (sv),
sv->edit_pos.col, sv->edit_pos.row);
@@ -332,7 +332,7 @@ parse_pos_init_evalpos (GnmParsePos *pp, GnmEvalPos const *ep)
GnmParsePos *
parse_pos_init_editpos (GnmParsePos *pp, SheetView const *sv)
{
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
return parse_pos_init (pp, NULL, sv_sheet (sv),
sv->edit_pos.col, sv->edit_pos.row);
diff --git a/src/selection.c b/src/selection.c
index 17a6934..27336fa 100644
--- a/src/selection.c
+++ b/src/selection.c
@@ -191,7 +191,7 @@ sv_is_colrow_selected (SheetView const *sv, int colrow, gboolean is_col)
{
GSList *l;
- g_return_val_if_fail (GNM_IS_SV (sv), FALSE);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), FALSE);
for (l = sv_selection_calc_simplification (sv);
l != NULL; l = l->next) {
@@ -227,7 +227,7 @@ sv_is_full_colrow_selected (SheetView const *sv, gboolean is_cols, int index)
GSList *l;
gboolean found = FALSE;
- g_return_val_if_fail (GNM_IS_SV (sv), FALSE);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), FALSE);
for (l = sv_selection_calc_simplification (sv);
l != NULL; l = l->next){
@@ -262,7 +262,7 @@ sv_selection_col_type (SheetView const *sv, int col)
GnmRange const *sr;
int ret = COL_ROW_NO_SELECTION;
- g_return_val_if_fail (GNM_IS_SV (sv), COL_ROW_NO_SELECTION);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), COL_ROW_NO_SELECTION);
if (sv->selections == NULL)
return COL_ROW_NO_SELECTION;
@@ -298,7 +298,7 @@ sv_selection_row_type (SheetView const *sv, int row)
GnmRange const *sr;
int ret = COL_ROW_NO_SELECTION;
- g_return_val_if_fail (GNM_IS_SV (sv), COL_ROW_NO_SELECTION);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), COL_ROW_NO_SELECTION);
if (sv->selections == NULL)
return COL_ROW_NO_SELECTION;
@@ -364,7 +364,7 @@ sv_menu_enable_insert (SheetView *sv, gboolean col, gboolean row)
{
int flags = 0;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
if (sv->enable_insert_cols != col) {
flags |= MS_INSERT_COLS;
@@ -403,7 +403,7 @@ selection_first_range (SheetView const *sv,
GnmRange const *r;
GSList *l;
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
l = sv->selections;
@@ -500,13 +500,13 @@ sheet_selection_set_internal (SheetView *sv,
*ss = new_sel;
/* Set the cursor boundary */
- sv_cursor_set (sv, edit,
+ gnm_sheet_view_cursor_set (sv, edit,
base_col, base_row,
move_col, move_row, ss);
if (just_add_it) {
- sv_redraw_range (sv, &new_sel);
- sv_redraw_headers (sv, TRUE, TRUE, &new_sel);
+ gnm_sheet_view_redraw_range (sv, &new_sel);
+ gnm_sheet_view_redraw_headers (sv, TRUE, TRUE, &new_sel);
goto set_menu_flags;
}
@@ -519,11 +519,11 @@ sheet_selection_set_internal (SheetView *sv,
ranges = range_fragment (&old_sel, &new_sel);
for (l = ranges->next; l; l = l->next)
- sv_redraw_range (sv, l->data);
+ gnm_sheet_view_redraw_range (sv, l->data);
range_fragment_free (ranges);
} else {
- sv_redraw_range (sv, &old_sel);
- sv_redraw_range (sv, &new_sel);
+ gnm_sheet_view_redraw_range (sv, &old_sel);
+ gnm_sheet_view_redraw_range (sv, &new_sel);
}
/* Has the entire row been selected/unselected */
@@ -531,7 +531,7 @@ sheet_selection_set_internal (SheetView *sv,
(old_sel.start.row == 0 && old_sel.end.row == gnm_sheet_get_last_row (sv->sheet)))
|| sv->selection_mode != GNM_SELECTION_MODE_ADD) {
GnmRange tmp = range_union (&new_sel, &old_sel);
- sv_redraw_headers (sv, TRUE, FALSE, &tmp);
+ gnm_sheet_view_redraw_headers (sv, TRUE, FALSE, &tmp);
} else {
GnmRange tmp = new_sel;
int diff;
@@ -545,7 +545,7 @@ sheet_selection_set_internal (SheetView *sv,
tmp.end.col = old_sel.start.col;
tmp.start.col = new_sel.start.col;
}
- sv_redraw_headers (sv, TRUE, FALSE, &tmp);
+ gnm_sheet_view_redraw_headers (sv, TRUE, FALSE, &tmp);
}
diff = new_sel.end.col - old_sel.end.col;
if (diff != 0) {
@@ -556,7 +556,7 @@ sheet_selection_set_internal (SheetView *sv,
tmp.end.col = old_sel.end.col;
tmp.start.col = new_sel.end.col;
}
- sv_redraw_headers (sv, TRUE, FALSE, &tmp);
+ gnm_sheet_view_redraw_headers (sv, TRUE, FALSE, &tmp);
}
}
@@ -565,7 +565,7 @@ sheet_selection_set_internal (SheetView *sv,
(old_sel.start.col == 0 && old_sel.end.col == gnm_sheet_get_last_col (sv->sheet)))
|| sv->selection_mode != GNM_SELECTION_MODE_ADD) {
GnmRange tmp = range_union (&new_sel, &old_sel);
- sv_redraw_headers (sv, FALSE, TRUE, &tmp);
+ gnm_sheet_view_redraw_headers (sv, FALSE, TRUE, &tmp);
} else {
GnmRange tmp = new_sel;
int diff;
@@ -579,7 +579,7 @@ sheet_selection_set_internal (SheetView *sv,
tmp.end.row = old_sel.start.row;
tmp.start.row = new_sel.start.row;
}
- sv_redraw_headers (sv, FALSE, TRUE, &tmp);
+ gnm_sheet_view_redraw_headers (sv, FALSE, TRUE, &tmp);
}
diff = new_sel.end.row - old_sel.end.row;
@@ -591,12 +591,12 @@ sheet_selection_set_internal (SheetView *sv,
tmp.end.row = old_sel.end.row;
tmp.start.row = new_sel.end.row;
}
- sv_redraw_headers (sv, FALSE, TRUE, &tmp);
+ gnm_sheet_view_redraw_headers (sv, FALSE, TRUE, &tmp);
}
}
set_menu_flags:
- sv_flag_selection_change (sv);
+ gnm_sheet_view_flag_selection_change (sv);
/*
* Now see if there is some selection which selects a
@@ -636,7 +636,7 @@ sv_selection_set (SheetView *sv, GnmCellPos const *edit,
int base_col, int base_row,
int move_col, int move_row)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
sheet_selection_set_internal (sv, edit,
base_col, base_row,
@@ -688,7 +688,7 @@ sv_selection_add_full (SheetView *sv,
GnmRange *ss;
GnmCellPos edit;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
sv_selection_simplify (sv);
/* Create and prepend new selection */
@@ -761,7 +761,7 @@ sv_selection_reset (SheetView *sv)
{
GSList *list, *tmp;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
/* Empty the sheets selection */
list = sv->selections;
@@ -771,8 +771,8 @@ sv_selection_reset (SheetView *sv)
/* Redraw the grid, & headers for each region */
for (tmp = list; tmp; tmp = tmp->next){
GnmRange *ss = tmp->data;
- sv_redraw_range (sv, ss);
- sv_redraw_headers (sv, TRUE, TRUE, ss);
+ gnm_sheet_view_redraw_range (sv, ss);
+ gnm_sheet_view_redraw_headers (sv, TRUE, TRUE, ss);
g_free (ss);
}
@@ -1094,7 +1094,7 @@ sv_selection_apply (SheetView *sv, SelectionApplyFunc const func,
GSList *l;
GSList *proposed = NULL;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
if (allow_intersection) {
for (l = sv_selection_calc_simplification (sv);
@@ -1154,7 +1154,7 @@ sv_selection_apply_in_order (SheetView *sv, SelectionApplyFunc const func,
{
GSList *l, *reverse;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
reverse = g_slist_copy (sv_selection_calc_simplification (sv));
reverse = g_slist_reverse (reverse);
@@ -1202,7 +1202,7 @@ sv_selection_foreach (SheetView *sv,
{
GSList *l;
- g_return_val_if_fail (GNM_IS_SV (sv), FALSE);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), FALSE);
for (l = sv_selection_calc_simplification (sv); l != NULL; l = l->next) {
GnmRange *ss = l->data;
@@ -1339,7 +1339,7 @@ sv_selection_walk_step (SheetView *sv, gboolean forward, gboolean horizontal)
gboolean is_singleton = FALSE;
GSList *selections;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (sv->selections != NULL);
selections = sv_selection_calc_simplification (sv);
@@ -1392,7 +1392,7 @@ sv_selection_walk_step (SheetView *sv, gboolean forward, gboolean horizontal)
sv_selection_set (sv, &destination,
destination.col, destination.row,
destination.col, destination.row);
- sv_make_cell_visible (sv, sv->edit_pos.col,
+ gnm_sheet_view_make_cell_visible (sv, sv->edit_pos.col,
sv->edit_pos.row, FALSE);
if (horizontal)
sv->first_tab_col = (first_tab_col < 0 || cur_col < first_tab_col) ? cur_col
: first_tab_col;
@@ -1417,13 +1417,13 @@ sv_selection_walk_step (SheetView *sv, gboolean forward, gboolean horizontal)
destination = ss->end;
}
if (selections_count != 1)
- sv_cursor_set (sv, &destination,
+ gnm_sheet_view_cursor_set (sv, &destination,
ss->start.col, ss->start.row,
ss->end.col, ss->end.row, NULL);
}
- sv_set_edit_pos (sv, &destination);
- sv_make_cell_visible (sv, destination.col, destination.row, FALSE);
+ gnm_sheet_view_set_edit_pos (sv, &destination);
+ gnm_sheet_view_make_cell_visible (sv, destination.col, destination.row, FALSE);
}
#include <goffice/goffice.h>
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index cd467d4..8080db6 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -385,7 +385,7 @@ scg_resize (SheetControlGUI *scg, G_GNUC_UNUSED gboolean force_scroll)
scg->pane[0]->row.item, FALSE,
-1, btn_h, scg->row_group.buttons, scg->row_group.button_box);
- if (scg->active_panes != 1 && sv_is_frozen (scg_view (scg))) {
+ if (scg->active_panes != 1 && gnm_sheet_view_is_frozen (scg_view (scg))) {
GnmCellPos const *tl = &scg_view (scg)->frozen_top_left;
GnmCellPos const *br = &scg_view (scg)->unfrozen_top_left;
int const l = scg_colrow_distance_get (scg, TRUE,
@@ -521,7 +521,7 @@ scg_scrollbar_config_real (SheetControl const *sc)
gnm_adjustment_configure
(va,
pane->first.row,
- sv_is_frozen (sv) ? sv->unfrozen_top_left.row : 0,
+ gnm_sheet_view_is_frozen (sv) ? sv->unfrozen_top_left.row : 0,
max_row + 1,
1,
MAX (gtk_adjustment_get_page_size (va) - 3.0, 1.0),
@@ -534,7 +534,7 @@ scg_scrollbar_config_real (SheetControl const *sc)
gnm_adjustment_configure
(ha,
pane->first.col,
- sv_is_frozen (sv) ? sv->unfrozen_top_left.col : 0,
+ gnm_sheet_view_is_frozen (sv) ? sv->unfrozen_top_left.col : 0,
max_col + 1,
1,
MAX (gtk_adjustment_get_page_size (ha) - 3.0, 1.0),
@@ -1168,10 +1168,10 @@ scg_set_panes (SheetControl *sc)
{
SheetControlGUI *scg = (SheetControlGUI *) sc;
SheetView *sv = sc->view;
- gboolean const being_frozen = sv_is_frozen (sv);
+ gboolean const being_frozen = gnm_sheet_view_is_frozen (sv);
GocDirection direction = (sv_sheet (sv)->text_is_rtl)? GOC_DIRECTION_RTL: GOC_DIRECTION_LTR;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
if (!scg->pane[0])
return;
@@ -1440,21 +1440,21 @@ resize_pane_finish (SheetControlGUI *scg, GtkPaned *p)
#endif
pane = resize_pane_pos (scg, p, &colrow, &guide_pos);
- if (sv_is_frozen (sv)) {
+ if (gnm_sheet_view_is_frozen (sv)) {
frozen_tl = sv->frozen_top_left;
unfrozen_tl = sv->unfrozen_top_left;
} else
frozen_tl = pane->first;
if (p == scg->hpane) {
unfrozen_tl.col = colrow;
- if (!sv_is_frozen (sv))
+ if (!gnm_sheet_view_is_frozen (sv))
unfrozen_tl.row = frozen_tl.row = 0;
} else {
unfrozen_tl.row = colrow;
- if (!sv_is_frozen (sv))
+ if (!gnm_sheet_view_is_frozen (sv))
unfrozen_tl.col = frozen_tl.col = 0;
}
- sv_freeze_panes (sv, &frozen_tl, &unfrozen_tl);
+ gnm_sheet_view_freeze_panes (sv, &frozen_tl, &unfrozen_tl);
scg->pane_drag_handler = 0;
scg_size_guide_stop (scg);
@@ -1627,7 +1627,7 @@ sheet_control_gui_new (SheetView *sv, WBCGtk *wbcg)
GocDirection direction;
GdkRGBA cfore, cback;
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
sheet = sv_sheet (sv);
direction = (sheet->text_is_rtl)? GOC_DIRECTION_RTL: GOC_DIRECTION_LTR;
@@ -1755,7 +1755,7 @@ sheet_control_gui_new (SheetView *sv, WBCGtk *wbcg)
G_CALLBACK (cb_table_destroy), G_OBJECT (scg),
G_CONNECT_SWAPPED);
- sv_attach_control (sv, GNM_SC (scg));
+ gnm_sheet_view_attach_control (sv, GNM_SC (scg));
g_object_connect (G_OBJECT (sheet),
"swapped_signal::notify::text-is-rtl", cb_scg_direction_changed, scg,
@@ -1790,7 +1790,7 @@ sheet_control_gui_new (SheetView *sv, WBCGtk *wbcg)
g_signal_connect (G_OBJECT (scg->vs), "key-press-event",
G_CALLBACK (sheet_object_key_pressed), scg);
}
- sv_attach_control (sv, GNM_SC (scg));
+ gnm_sheet_view_attach_control (sv, GNM_SC (scg));
if (scg->vs) {
g_object_set_data (G_OBJECT (scg->vs), "sheet-control", scg);
if (sheet->sheet_objects) {
@@ -1897,7 +1897,7 @@ scg_finalize (GObject *object)
g_signal_handlers_disconnect_by_func (sheet, cb_scg_redraw_resize, scg);
g_signal_handlers_disconnect_by_func (sheet, cb_scg_sheet_resized, scg);
g_signal_handlers_disconnect_by_func (sheet, cb_scg_direction_changed, scg);
- sv_detach_control (sc);
+ gnm_sheet_view_detach_control (sc);
}
if (scg->grid) {
@@ -2056,10 +2056,10 @@ context_menu_handler (GnmPopupMenuElement const *element,
switch (element->index) {
case CONTEXT_CUT:
- sv_selection_cut (sv, wbc);
+ gnm_sheet_view_selection_cut (sv, wbc);
break;
case CONTEXT_COPY:
- sv_selection_copy (sv, wbc);
+ gnm_sheet_view_selection_copy (sv, wbc);
break;
case CONTEXT_PASTE:
cmd_paste_to_selection (wbc, sv, PASTE_DEFAULT);
@@ -2462,7 +2462,7 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
range_init_cellpos (&rge, &sv->edit_pos);
has_link = (NULL != sheet_style_region_contains_link (sheet, &rge));
- slicer = sv_editpos_in_slicer (scg_view (scg));
+ slicer = gnm_sheet_view_editpos_in_slicer (scg_view (scg));
/* FIXME: disabled for now */
if (0 && slicer) {
GODataSlicerField *dsf = gnm_sheet_slicer_field_header_at_pos (slicer, &sv->edit_pos);
@@ -3692,9 +3692,9 @@ scg_cursor_move (SheetControlGUI *scg, int n,
step, jump_to_bound);
sv_selection_reset (sv);
- sv_cursor_set (sv, &tmp,
+ gnm_sheet_view_cursor_set (sv, &tmp,
tmp.col, tmp.row, tmp.col, tmp.row, NULL);
- sv_make_cell_visible (sv, tmp.col, tmp.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, tmp.col, tmp.row, FALSE);
sv_selection_add_pos (sv, tmp.col, tmp.row, GNM_SELECTION_MODE_ADD);
}
@@ -3727,7 +3727,7 @@ scg_cursor_extend (SheetControlGUI *scg, int n,
n, jump_to_bound);
sv_selection_extend_to (sv, move.col, move.row);
- sv_make_cell_visible (sv, visible.col, visible.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, visible.col, visible.row, FALSE);
}
void
diff --git a/src/sheet-merge.c b/src/sheet-merge.c
index ef46280..73d7877 100644
--- a/src/sheet-merge.c
+++ b/src/sheet-merge.c
@@ -136,7 +136,7 @@ gnm_sheet_merge_add (Sheet *sheet, GnmRange const *r, gboolean clear,
SHEET_FOREACH_VIEW (sheet, sv, {
sv->reposition_selection = TRUE;
if (range_contains (&r2, sv->edit_pos.col, sv->edit_pos.row))
- sv_set_edit_pos (sv, &r2.start);
+ gnm_sheet_view_set_edit_pos (sv, &r2.start);
});
comment = sheet_get_comment (sheet, &r2.start);
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 117b048..ea85423 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -263,7 +263,7 @@ sheet_object_populate_menu_real (SheetObject *so, GPtrArray *actions)
static SheetObjectAction const so_actions [] = {
{ GTK_STOCK_PROPERTIES, NULL, NULL, 0, sheet_object_get_editor,
sheet_object_can_prop},
{ NULL, NULL, NULL, 0, NULL, NULL },
-#warning "Two high dubious icon names here"
+#warning "Two highly dubious icon names here"
{ GTK_STOCK_LEAVE_FULLSCREEN, N_("Size _& Position"), NULL, 0,
cb_so_size_position, NULL },
{ GTK_STOCK_FULLSCREEN, N_("_Snap to Grid"), NULL, 0, cb_so_snap_to_grid,
NULL },
{ NULL, N_("_Order"), NULL, 1, NULL, NULL },
@@ -480,7 +480,7 @@ sheet_object_get_view (SheetObject const *so, SheetObjectViewContainer *containe
/**
* sheet_object_update_bounds:
* @so: The sheet object
- * @p: An optional position marking the top left of the region
+ * @p: (nullable): A position marking the top left of the region
* needing relocation (default == A1)
*
* update the bounds of an object that intersects the region whose top left
@@ -572,7 +572,7 @@ cb_create_views (SheetObject *so)
*
* Adds a reference to the object.
*
- * Returns TRUE if there was a problem
+ * Returns: %TRUE if there was a problem
**/
gboolean
sheet_object_set_sheet (SheetObject *so, Sheet *sheet)
@@ -844,6 +844,12 @@ sheet_object_draw_cairo_sized (SheetObject const *so, cairo_t *cr, double width,
SO_CLASS (so)->draw_cairo (so, cr, width, height);
}
+/**
+ * sheet_object_get_range:
+ * @so: the #SheetObject to query
+ *
+ * Returns: (transfer none): the #GnmRange used for @so.
+ */
GnmRange const *
sheet_object_get_range (SheetObject const *so)
{
@@ -1176,13 +1182,12 @@ sheet_objects_relocate (GnmExprRelocateInfo const *rinfo, gboolean update,
/**
* sheet_objects_get:
* @sheet: the sheet.
- * @r: an optional range to look in
- * @t: The type of object to lookup
+ * @r: (nullable): #GnmRange to look in
+ * @t: The type of object to lookup, %G_TYPE_NONE for any.
*
- * Returns: (element-type SheetObject) (transfer container): a list of which
- * the caller must free (just the list not the content).
- * Containing all objects of exactly the specified type (inheritence does not count)
- * that are completely contained by @r.
+ * Returns: (element-type SheetObject) (transfer container): a list
+ * containing all objects of exactly the specified type (inheritence does
+ * not count) that are completely contained in @r.
**/
GSList *
sheet_objects_get (Sheet const *sheet, GnmRange const *r, GType t)
@@ -1207,9 +1212,9 @@ sheet_objects_get (Sheet const *sheet, GnmRange const *r, GType t)
/**
* sheet_objects_clear:
* @sheet: the sheet.
- * @r: an optional range to look in
+ * @r: (nullable): #GnmRange to look in
*
- * removes the objects in the region.
+ * Removes the objects in the region.
**/
void
sheet_objects_clear (Sheet const *sheet, GnmRange const *r, GType t,
@@ -1236,7 +1241,6 @@ sheet_objects_clear (Sheet const *sheet, GnmRange const *r, GType t,
* @so: a #SheetObject to duplicate
*
* Returns: (transfer full): A copy of @so that is not attached to a sheet.
- * Caller is responsible for the reference.
**/
SheetObject *
sheet_object_dup (SheetObject const *so)
@@ -1282,7 +1286,7 @@ cb_sheet_objects_dup (GnmDependent *dep, SheetObject *so, gpointer user)
* sheet_objects_dup:
* @src: The source sheet to read the objects from
* @dst: The destination sheet to attach the objects to
- * @range: Optionally NULL region of interest
+ * @range: (nullable): #GnmRange to look in
*
* Clones the objects of the src sheet and attaches them into the dst sheet
**/
@@ -1314,7 +1318,7 @@ sheet_objects_dup (Sheet const *src, Sheet *dst, GnmRange *range)
/**
* sheet_object_direction_set:
* @so: The sheet object that we are calculating the direction for
- * @coords: array of coordinates in L,T,R,B order
+ * @coords: (in) (array fixed-size=4): array of coordinates in L,T,R,B order
*
* Sets the object direction from the given the new coordinates
* The original coordinates are assumed to be normalized (so that top
@@ -1338,8 +1342,8 @@ sheet_object_direction_set (SheetObject *so, gdouble const *coords)
* sheet_object_rubber_band_directly:
* @so:
*
- * Returns TRUE if we should draw the object as we are laying it out on
- * an sheet. If FLASE we draw a rectangle where the object is going to go
+ * Returns: %TRUE if we should draw the object as we are laying it out on
+ * an sheet. If %FALSE we draw a rectangle where the object is going to go
*
* Return Value:
**/
@@ -1352,8 +1356,8 @@ sheet_object_rubber_band_directly (G_GNUC_UNUSED SheetObject const *so)
/**
* sheet_object_anchor_init:
* @anchor: #SheetObjectAnchor
- * @cell_bound: #GnmRange
- * @offsets: double[4]
+ * @r: (nullable): #GnmRange to look in
+ * @offsets: (in) (array fixed-size=4) (nullable):
* @direction: #GODrawingAnchorDir
* @mode: #GnmSOAnchorMode
*
@@ -1364,7 +1368,7 @@ void
sheet_object_anchor_init (SheetObjectAnchor *anchor,
GnmRange const *r, const double *offsets,
GODrawingAnchorDir direction,
- GnmSOAnchorMode mode)
+ GnmSOAnchorMode mode)
{
int i;
@@ -1392,7 +1396,7 @@ sheet_object_anchor_init (SheetObjectAnchor *anchor,
* sheet_object_get_stacking:
* @so: #SheetObject
*
- * Returns @so's position in the stack of sheet objects.
+ * Returns: @so's position in the stack of sheet objects.
**/
gint
sheet_object_get_stacking (SheetObject *so)
diff --git a/src/sheet-object.h b/src/sheet-object.h
index 9c65d5d..2ae4531 100644
--- a/src/sheet-object.h
+++ b/src/sheet-object.h
@@ -116,7 +116,7 @@ void sheet_object_anchor_to_pts (SheetObjectAnchor const *anchor,
void sheet_object_anchor_to_offset_pts (SheetObjectAnchor const *anchor,
Sheet const *sheet, double *res_pts);
void sheet_object_anchor_init (SheetObjectAnchor *anchor,
- GnmRange const *cell_bound,
+ GnmRange const *r,
const double *offsets,
GODrawingAnchorDir direction,
GnmSOAnchorMode mode);
diff --git a/src/sheet-view.c b/src/sheet-view.c
index 97318d9..b6a0d4c 100644
--- a/src/sheet-view.c
+++ b/src/sheet-view.c
@@ -49,6 +49,9 @@
#include <gsf/gsf-impl-utils.h>
+#define GNM_SHEET_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNM_SHEET_VIEW_TYPE, SheetViewClass))
+static GObjectClass *parent_class;
+
/*************************************************************************/
static void
@@ -79,7 +82,7 @@ sv_sheet_name_changed (G_GNUC_UNUSED Sheet *sheet,
G_GNUC_UNUSED GParamSpec *pspec,
SheetView *sv)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
sv->edit_pos_changed.content = TRUE;
}
@@ -88,7 +91,7 @@ sv_sheet_visibility_changed (Sheet *sheet,
G_GNUC_UNUSED GParamSpec *pspec,
SheetView *sv)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
/* See bug 366477. */
if (sheet_is_visible (sheet) && !wb_view_cur_sheet (sv->sv_wbv))
wb_view_sheet_focus (sv->sv_wbv, sheet);
@@ -99,7 +102,7 @@ sv_sheet_r1c1_changed (G_GNUC_UNUSED Sheet *sheet,
G_GNUC_UNUSED GParamSpec *pspec,
SheetView *sv)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
sv->edit_pos_changed.location = TRUE;
}
@@ -112,7 +115,7 @@ sv_sheet_r1c1_changed (G_GNUC_UNUSED Sheet *sheet,
Sheet *
sv_sheet (SheetView const *sv)
{
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
return sv->sheet;
}
@@ -125,7 +128,7 @@ sv_sheet (SheetView const *sv)
WorkbookView *
sv_wbv (SheetView const *sv)
{
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
return sv->sv_wbv;
}
@@ -150,9 +153,9 @@ sv_init_sc (SheetView const *sv, SheetControl *sc)
}
void
-sv_attach_control (SheetView *sv, SheetControl *sc)
+gnm_sheet_view_attach_control (SheetView *sv, SheetControl *sc)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (GNM_IS_SC (sc));
g_return_if_fail (sc->view == NULL);
@@ -164,10 +167,10 @@ sv_attach_control (SheetView *sv, SheetControl *sc)
}
void
-sv_detach_control (SheetControl *sc)
+gnm_sheet_view_detach_control (SheetControl *sc)
{
g_return_if_fail (GNM_IS_SC (sc));
- g_return_if_fail (GNM_IS_SV (sc->view));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sc->view));
g_ptr_array_remove (sc->view->controls, sc);
if (sc->view->controls->len == 0) {
@@ -186,7 +189,7 @@ sv_weakref_notify (SheetView **ptr, GObject *sv)
}
void
-sv_weak_ref (SheetView *sv, SheetView **ptr)
+gnm_sheet_view_weak_ref (SheetView *sv, SheetView **ptr)
{
g_return_if_fail (ptr != NULL);
@@ -198,7 +201,7 @@ sv_weak_ref (SheetView *sv, SheetView **ptr)
}
void
-sv_weak_unref (SheetView **ptr)
+gnm_sheet_view_weak_unref (SheetView **ptr)
{
g_return_if_fail (ptr != NULL);
@@ -210,16 +213,14 @@ sv_weak_unref (SheetView **ptr)
}
}
-static GObjectClass *parent_class;
-
static void
sv_real_dispose (GObject *object)
{
- SheetView *sv = GNM_SV (object);
+ SheetView *sv = GNM_SHEET_VIEW (object);
if (sv->controls != NULL) {
SHEET_VIEW_FOREACH_CONTROL (sv, control, {
- sv_detach_control (control);
+ gnm_sheet_view_detach_control (control);
g_object_unref (control);
});
if (sv->controls != NULL)
@@ -237,7 +238,7 @@ sv_real_dispose (GObject *object)
g_object_unref (sheet);
}
- sv_unant (sv);
+ gnm_sheet_view_unant (sv);
sv_selection_free (sv);
sv_selection_simplified_free (sv);
auto_expr_timer_clear (sv);
@@ -246,9 +247,9 @@ sv_real_dispose (GObject *object)
}
static void
-sheet_view_class_init (GObjectClass *klass)
+gnm_sheet_view_class_init (GObjectClass *klass)
{
- SheetViewClass *wbc_class = GNM_SV_CLASS (klass);
+ SheetViewClass *wbc_class = GNM_SHEET_VIEW_CLASS (klass);
g_return_if_fail (wbc_class != NULL);
@@ -257,9 +258,9 @@ sheet_view_class_init (GObjectClass *klass)
}
static void
-sheet_view_init (GObject *object)
+gnm_sheet_view_init (GObject *object)
{
- SheetView *sv = GNM_SV (object);
+ SheetView *sv = GNM_SHEET_VIEW (object);
/* Init menu states */
sv->enable_insert_rows = TRUE;
@@ -283,18 +284,18 @@ sheet_view_init (GObject *object)
sv_selection_add_pos (sv, 0, 0, GNM_SELECTION_MODE_ADD);
}
-GSF_CLASS (SheetView, sheet_view,
- sheet_view_class_init, sheet_view_init,
+GSF_CLASS (SheetView, gnm_sheet_view,
+ gnm_sheet_view_class_init, gnm_sheet_view_init,
G_TYPE_OBJECT)
SheetView *
-sheet_view_new (Sheet *sheet, WorkbookView *wbv)
+gnm_sheet_view_new (Sheet *sheet, WorkbookView *wbv)
{
SheetView *sv;
g_return_val_if_fail (IS_SHEET (sheet), NULL);
- sv = g_object_new (GNM_SV_TYPE, NULL);
+ sv = g_object_new (GNM_SHEET_VIEW_TYPE, NULL);
sv->sheet = g_object_ref (sheet);
sv->sv_wbv = wbv;
g_ptr_array_add (sheet->sheet_views, sv);
@@ -321,17 +322,17 @@ sheet_view_new (Sheet *sheet, WorkbookView *wbv)
}
void
-sv_dispose (SheetView *sv)
+gnm_sheet_view_dispose (SheetView *sv)
{
g_object_run_dispose (G_OBJECT (sv));
}
void
-sv_unant (SheetView *sv)
+gnm_sheet_view_unant (SheetView *sv)
{
GList *ptr;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
if (sv->ants == NULL)
return;
@@ -345,20 +346,20 @@ sv_unant (SheetView *sv)
}
/**
- * sv_ant:
+ * gnm_sheet_view_ant:
* @sv:
- * @ranges: (element-type GnmRange):
+ * @ranges: (element-type GnmRange) (transfer none): The ranges to ant.
*/
void
-sv_ant (SheetView *sv, GList *ranges)
+gnm_sheet_view_ant (SheetView *sv, GList *ranges)
{
GList *ptr;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (ranges != NULL);
if (sv->ants != NULL)
- sv_unant (sv);
+ gnm_sheet_view_unant (sv);
for (ptr = ranges; ptr != NULL; ptr = ptr->next)
sv->ants = g_list_prepend (sv->ants, gnm_range_dup (ptr->data));
sv->ants = g_list_reverse (sv->ants);
@@ -368,39 +369,49 @@ sv_ant (SheetView *sv, GList *ranges)
}
void
-sv_make_cell_visible (SheetView *sv, int col, int row,
+gnm_sheet_view_make_cell_visible (SheetView *sv, int col, int row,
gboolean couple_panes)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
SHEET_VIEW_FOREACH_CONTROL(sv, control,
sc_make_cell_visible (control, col, row, couple_panes););
}
void
-sv_redraw_range (SheetView *sv, GnmRange const *r)
+gnm_sheet_view_redraw_range (SheetView *sv, GnmRange const *r)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
SHEET_VIEW_FOREACH_CONTROL (sv, sc, sc_redraw_range (sc, r););
}
void
-sv_redraw_headers (SheetView const *sv,
+gnm_sheet_view_redraw_headers (SheetView const *sv,
gboolean col, gboolean row,
GnmRange const* r /* optional == NULL */)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
SHEET_VIEW_FOREACH_CONTROL (sv, control,
sc_redraw_headers (control, col, row, r););
}
+void
+gnm_sheet_view_resize (SheetView *sv, gboolean force_scroll)
+{
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
+
+ SHEET_VIEW_FOREACH_CONTROL (sv, control,
+ sc_resize (control, force_scroll););
+}
+
+
gboolean
-sv_selection_copy (SheetView *sv, WorkbookControl *wbc)
+gnm_sheet_view_selection_copy (SheetView *sv, WorkbookControl *wbc)
{
GnmRange const *sel;
- g_return_val_if_fail (GNM_IS_SV (sv), FALSE);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), FALSE);
if (!(sel = selection_first_range (sv, GO_CMD_CONTEXT (wbc), _("Copy"))))
return FALSE;
@@ -410,7 +421,7 @@ sv_selection_copy (SheetView *sv, WorkbookControl *wbc)
}
gboolean
-sv_selection_cut (SheetView *sv, WorkbookControl *wbc)
+gnm_sheet_view_selection_cut (SheetView *sv, WorkbookControl *wbc)
{
GnmRange const *sel;
@@ -424,7 +435,7 @@ sv_selection_cut (SheetView *sv, WorkbookControl *wbc)
* NOTE : This command DOES NOT MOVE ANYTHING !
* We only store the src, paste does the move.
*/
- g_return_val_if_fail (GNM_IS_SV (sv), FALSE);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), FALSE);
if (!(sel = selection_first_range (sv, GO_CMD_CONTEXT (wbc), _("Cut"))))
return FALSE;
@@ -438,17 +449,17 @@ sv_selection_cut (SheetView *sv, WorkbookControl *wbc)
}
/**
- * sv_cursor_set:
+ * gnm_sheet_view_cursor_set:
* @sv: The sheet
* @edit:
* @base_col:
* @base_row:
* @move_col:
* @move_row:
- * @bound: An optionally NULL range that should contain all the supplied points
+ * @bound: (nullable): A range that should contain all the supplied points
**/
void
-sv_cursor_set (SheetView *sv,
+gnm_sheet_view_cursor_set (SheetView *sv,
GnmCellPos const *edit,
int base_col, int base_row,
int move_col, int move_row,
@@ -456,10 +467,10 @@ sv_cursor_set (SheetView *sv,
{
GnmRange r;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
/* Change the edit position */
- sv_set_edit_pos (sv, edit);
+ gnm_sheet_view_set_edit_pos (sv, edit);
sv->cursor.base_corner.col = base_col;
sv->cursor.base_corner.row = base_row;
@@ -491,12 +502,12 @@ sv_cursor_set (SheetView *sv,
}
void
-sv_set_edit_pos (SheetView *sv, GnmCellPos const *pos)
+gnm_sheet_view_set_edit_pos (SheetView *sv, GnmCellPos const *pos)
{
GnmCellPos old;
GnmRange const *merged;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (pos != NULL);
old = sv->edit_pos;
@@ -521,9 +532,9 @@ sv_set_edit_pos (SheetView *sv, GnmCellPos const *pos)
/* Redraw before change */
if (merged == NULL) {
GnmRange tmp; tmp.start = tmp.end = old;
- sv_redraw_range (sv, &tmp);
+ gnm_sheet_view_redraw_range (sv, &tmp);
} else
- sv_redraw_range (sv, merged);
+ gnm_sheet_view_redraw_range (sv, merged);
sv->edit_pos_real = *pos;
@@ -531,16 +542,16 @@ sv_set_edit_pos (SheetView *sv, GnmCellPos const *pos)
merged = gnm_sheet_merge_contains_pos (sv->sheet, &sv->edit_pos_real);
if (merged == NULL) {
GnmRange tmp; tmp.start = tmp.end = *pos;
- sv_redraw_range (sv, &tmp);
+ gnm_sheet_view_redraw_range (sv, &tmp);
sv->edit_pos = sv->edit_pos_real;
} else {
- sv_redraw_range (sv, merged);
+ gnm_sheet_view_redraw_range (sv, merged);
sv->edit_pos = merged->start;
}
}
/**
- * sv_flag_status_update_pos:
+ * gnm_sheet_view_flag_status_update_pos:
* @sv:
* @pos:
*
@@ -552,9 +563,9 @@ sv_set_edit_pos (SheetView *sv, GnmCellPos const *pos)
* updated if appropriate.
*/
void
-sv_flag_status_update_pos (SheetView *sv, GnmCellPos const *pos)
+gnm_sheet_view_flag_status_update_pos (SheetView *sv, GnmCellPos const *pos)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (pos != NULL);
/* if a part of the selected region changed value update
@@ -572,9 +583,9 @@ sv_flag_status_update_pos (SheetView *sv, GnmCellPos const *pos)
}
/**
- * sv_flag_status_update_range:
+ * gnm_sheet_view_flag_status_update_range:
* @sv:
- * @range: If NULL then force an update.
+ * @range: (nullable): If %NULL then force an update.
*
* flag the sheet as requiring an update to the status display if the supplied
* cell location contains the edit cursor, or intersects of the selected region.
@@ -583,9 +594,9 @@ sv_flag_status_update_pos (SheetView *sv, GnmCellPos const *pos)
* updated if appropriate.
*/
void
-sv_flag_status_update_range (SheetView *sv, GnmRange const *range)
+gnm_sheet_view_flag_status_update_range (SheetView *sv, GnmRange const *range)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
/* Force an update */
if (range == NULL) {
@@ -610,23 +621,23 @@ sv_flag_status_update_range (SheetView *sv, GnmRange const *range)
}
/**
- * sv_flag_style_update_range:
+ * gnm_sheet_view_flag_style_update_range:
* @sv: The sheet being changed
* @range: the range that is changing.
*
- * Flag style changes that will require updating the style indicators.
+ * Flag style changes that will require updating the style indicators.
*/
void
-sv_flag_style_update_range (SheetView *sv, GnmRange const *range)
+gnm_sheet_view_flag_style_update_range (SheetView *sv, GnmRange const *range)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (range != NULL);
if (range_contains (range, sv->edit_pos.col, sv->edit_pos.row))
sv->edit_pos_changed.style = TRUE;
}
/**
- * sv_flag_selection_change:
+ * gnm_sheet_view_flag_selection_change:
* @sv:
*
* flag the sheet as requiring an update to the status display
@@ -634,9 +645,9 @@ sv_flag_style_update_range (SheetView *sv, GnmRange const *range)
* Will cause auto expressions to be updated
*/
void
-sv_flag_selection_change (SheetView *sv)
+gnm_sheet_view_flag_selection_change (SheetView *sv)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
sv->selection_content_changed = TRUE;
}
@@ -658,9 +669,9 @@ sheet_view_edit_pos_tool_tips (SheetView *sv)
}
void
-sv_update (SheetView *sv)
+gnm_sheet_view_update (SheetView *sv)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
if (sv->edit_pos_changed.content) {
sv->edit_pos_changed.content = FALSE;
@@ -706,30 +717,30 @@ sv_update (SheetView *sv)
}
/**
- * sv_editpos_in_filter:
+ * gnm_sheet_view_editpos_in_filter:
* @sv: #SheetView
*
- * Returns: %NULL or GnmFilter that overlaps the sv::edit_pos
+ * Returns: (nullable): #GnmFilter that overlaps the sv::edit_pos
**/
GnmFilter *
-sv_editpos_in_filter (SheetView const *sv)
+gnm_sheet_view_editpos_in_filter (SheetView const *sv)
{
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
return gnm_sheet_filter_at_pos (sv->sheet, &sv->edit_pos);
}
/**
- * sv_selection_intersects_filter_rows:
+ * gnm_sheet_view_selection_intersects_filter_rows:
* @sv: #SheetView
*
- * Returns: %NULL or GnmFilter whose rows intersect the rows
+ * Returns: (nullable): #GnmFilter whose rows intersect the rows
* of the current selection.
**/
GnmFilter *
-sv_selection_intersects_filter_rows (SheetView const *sv)
+gnm_sheet_view_selection_intersects_filter_rows (SheetView const *sv)
{
GnmRange const *r;
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
r = selection_first_range (sv, NULL, NULL);
return r ? gnm_sheet_filter_intersect_rows
@@ -737,18 +748,19 @@ sv_selection_intersects_filter_rows (SheetView const *sv)
}
/**
- * sv_selection_extends_filter:
+ * gnm_sheet_view_selection_extends_filter:
* @sv: #SheetView
*
- * Returns: %NULL or GnmFilter whose rows intersect the rows
- * of the current selectiona range to which the filter can be
+ * Returns: (nullable): #GnmFilter whose rows intersect the rows
+ * of the current selection range to which the filter can be
* extended.
**/
GnmRange *
-sv_selection_extends_filter (SheetView const *sv, GnmFilter const *f)
+gnm_sheet_view_selection_extends_filter (SheetView const *sv,
+ GnmFilter const *f)
{
GnmRange const *r;
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
r = selection_first_range (sv, NULL, NULL);
return gnm_sheet_filter_can_be_extended (sv->sheet, f, r);
@@ -758,34 +770,34 @@ sv_selection_extends_filter (SheetView const *sv, GnmFilter const *f)
/**
- * sv_editpos_in_slicer:
+ * gnm_sheet_view_editpos_in_slicer:
* @sv: #SheetView
*
- * Returns: (transfer none): %NULL or #GnmSheetSlicer that overlaps the
+ * Returns: (transfer none) (nullable): #GnmSheetSlicer that overlaps the
* sv::edit_pos
**/
GnmSheetSlicer *
-sv_editpos_in_slicer (SheetView const *sv)
+gnm_sheet_view_editpos_in_slicer (SheetView const *sv)
{
- g_return_val_if_fail (GNM_IS_SV (sv), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), NULL);
return gnm_sheet_slicers_at_pos (sv->sheet, &sv->edit_pos);
}
/**
- * sv_freeze_panes:
+ * gnm_sheet_view_freeze_panes:
* @sv: the sheet
- * @frozen_top_left: top left corner of the frozen region
- * @unfrozen_top_left: top left corner of the unfrozen region
+ * @frozen_top_left: (nullable): top left corner of the frozen region
+ * @unfrozen_top_left: (nullable): top left corner of the unfrozen region
*
* By definition the unfrozen region must be below the frozen.
* If @frozen_top_left == @unfrozen_top_left or @frozen_top_left == NULL unfreeze
**/
void
-sv_freeze_panes (SheetView *sv,
- GnmCellPos const *frozen,
- GnmCellPos const *unfrozen)
+gnm_sheet_view_freeze_panes (SheetView *sv,
+ GnmCellPos const *frozen,
+ GnmCellPos const *unfrozen)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
if (gnm_debug_flag ("frozen-panes")) {
g_printerr ("Frozen: %-10s",
@@ -836,7 +848,7 @@ sv_freeze_panes (SheetView *sv,
}
/**
- * sv_panes_insdel_colrow:
+ * gnm_sheet_view_panes_insdel_colrow:
* @sv:
* @is_cols:
* @is_insert:
@@ -848,13 +860,13 @@ sv_freeze_panes (SheetView *sv,
* have already set the flags that will force a resize.
**/
void
-sv_panes_insdel_colrow (SheetView *sv, gboolean is_cols,
- gboolean is_insert, int start, int count)
+gnm_sheet_view_panes_insdel_colrow (SheetView *sv, gboolean is_cols,
+ gboolean is_insert, int start, int count)
{
GnmCellPos tl;
GnmCellPos br;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
tl = sv->frozen_top_left; /* _copy_ them */
br = sv->unfrozen_top_left;
@@ -894,13 +906,13 @@ sv_panes_insdel_colrow (SheetView *sv, gboolean is_cols,
br.row = tl.row + 1;
}
}
- sv_freeze_panes (sv, &tl, &br);
+ gnm_sheet_view_freeze_panes (sv, &tl, &br);
}
gboolean
-sv_is_frozen (SheetView const *sv)
+gnm_sheet_view_is_frozen (SheetView const *sv)
{
- g_return_val_if_fail (GNM_IS_SV (sv), FALSE);
+ g_return_val_if_fail (GNM_IS_SHEET_VIEW (sv), FALSE);
/* be flexible, in the future we will support 2 way splits too */
return sv->unfrozen_top_left.col >= 0 ||
@@ -908,7 +920,7 @@ sv_is_frozen (SheetView const *sv)
}
/**
- sv_set_initial_top_left:
+ gnm_sheet_view_set_initial_top_left:
* @sv: the sheet view.
* @col:
* @row:
@@ -921,12 +933,12 @@ sv_is_frozen (SheetView const *sv)
* left.
*/
void
-sv_set_initial_top_left (SheetView *sv, int col, int row)
+gnm_sheet_view_set_initial_top_left (SheetView *sv, int col, int row)
{
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (0 <= col && col < gnm_sheet_get_max_cols (sv->sheet));
g_return_if_fail (0 <= row && row < gnm_sheet_get_max_rows (sv->sheet));
- g_return_if_fail (!sv_is_frozen (sv) ||
+ g_return_if_fail (!gnm_sheet_view_is_frozen (sv) ||
(sv->unfrozen_top_left.col <= col &&
sv->unfrozen_top_left.row <= row));
diff --git a/src/sheet-view.h b/src/sheet-view.h
index f659f03..8408424 100644
--- a/src/sheet-view.h
+++ b/src/sheet-view.h
@@ -66,62 +66,62 @@ struct _SheetView {
typedef GObjectClass SheetViewClass;
-#define GNM_SV_TYPE (sheet_view_get_type ())
-#define GNM_SV(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNM_SV_TYPE, SheetView))
-#define GNM_IS_SV(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_SV_TYPE))
-#define GNM_SV_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNM_SV_TYPE, SheetViewClass))
+#define GNM_SHEET_VIEW_TYPE (gnm_sheet_view_get_type ())
+#define GNM_SHEET_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNM_SHEET_VIEW_TYPE, SheetView))
+#define GNM_IS_SHEET_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_SHEET_VIEW_TYPE))
/* Lifecycle */
-GType sheet_view_get_type (void);
-SheetView *sheet_view_new (Sheet *sheet, WorkbookView *wbv);
-void sv_attach_control (SheetView *sv, SheetControl *sc);
-void sv_detach_control (SheetControl *sc);
-void sv_weak_ref (SheetView *sv, SheetView **ptr);
-void sv_weak_unref (SheetView **ptr);
-void sv_update (SheetView *sv);
-void sv_dispose (SheetView *sv);
+GType gnm_sheet_view_get_type (void);
+SheetView *gnm_sheet_view_new (Sheet *sheet, WorkbookView *wbv);
+void gnm_sheet_view_attach_control (SheetView *sv, SheetControl *sc);
+void gnm_sheet_view_detach_control (SheetControl *sc);
+void gnm_sheet_view_weak_ref (SheetView *sv, SheetView **ptr);
+void gnm_sheet_view_weak_unref (SheetView **ptr);
+void gnm_sheet_view_update (SheetView *sv);
+void gnm_sheet_view_dispose (SheetView *sv);
/* Information */
Sheet *sv_sheet (SheetView const *sv);
WorkbookView *sv_wbv (SheetView const *sv);
-gboolean sv_is_frozen (SheetView const *sv);
+gboolean gnm_sheet_view_is_frozen (SheetView const *sv);
-GnmFilter *sv_editpos_in_filter (SheetView const *sv);
-GnmFilter *sv_selection_intersects_filter_rows (SheetView const *sv);
-GnmRange *sv_selection_extends_filter (SheetView const *sv,
+GnmFilter *gnm_sheet_view_editpos_in_filter (SheetView const *sv);
+GnmFilter *gnm_sheet_view_selection_intersects_filter_rows (SheetView const *sv);
+GnmRange *gnm_sheet_view_selection_extends_filter (SheetView const *sv,
GnmFilter const *f);
-GnmSheetSlicer *sv_editpos_in_slicer (SheetView const *sv);
+GnmSheetSlicer *gnm_sheet_view_editpos_in_slicer (SheetView const *sv);
/* Manipulation */
-void sv_flag_status_update_pos (SheetView *sv, GnmCellPos const *pos);
-void sv_flag_status_update_range (SheetView *sv, GnmRange const *range);
-void sv_flag_style_update_range (SheetView *sv, GnmRange const *range);
-void sv_flag_selection_change (SheetView *sv);
+void gnm_sheet_view_flag_status_update_pos (SheetView *sv, GnmCellPos const *pos);
+void gnm_sheet_view_flag_status_update_range (SheetView *sv, GnmRange const *range);
+void gnm_sheet_view_flag_style_update_range (SheetView *sv, GnmRange const *range);
+void gnm_sheet_view_flag_selection_change (SheetView *sv);
-void sv_unant (SheetView *sv);
-void sv_ant (SheetView *sv, GList *ranges);
-gboolean sv_selection_copy (SheetView *sv, WorkbookControl *wbc);
-gboolean sv_selection_cut (SheetView *sv, WorkbookControl *wbc);
+void gnm_sheet_view_unant (SheetView *sv);
+void gnm_sheet_view_ant (SheetView *sv, GList *ranges);
+gboolean gnm_sheet_view_selection_copy (SheetView *sv, WorkbookControl *wbc);
+gboolean gnm_sheet_view_selection_cut (SheetView *sv, WorkbookControl *wbc);
-void sv_make_cell_visible (SheetView *sv, int col, int row,
+void gnm_sheet_view_make_cell_visible (SheetView *sv, int col, int row,
gboolean couple_panes);
-void sv_redraw_range (SheetView *sv, GnmRange const *r);
-void sv_redraw_headers (SheetView const *sheet,
+void gnm_sheet_view_redraw_range (SheetView *sv, GnmRange const *r);
+void gnm_sheet_view_redraw_headers (SheetView const *sheet,
gboolean col, gboolean row,
- GnmRange const* r /* optional == NULL */);
-void sv_cursor_set (SheetView *sv,
+ GnmRange const* r);
+void gnm_sheet_view_resize (SheetView *sv, gboolean force_scroll);
+void gnm_sheet_view_cursor_set (SheetView *sv,
GnmCellPos const *edit,
int base_col, int base_row,
int move_col, int move_row,
GnmRange const *bound);
-void sv_set_edit_pos (SheetView *sv, GnmCellPos const *pos);
+void gnm_sheet_view_set_edit_pos (SheetView *sv, GnmCellPos const *pos);
-void sv_freeze_panes (SheetView *sv,
+void gnm_sheet_view_freeze_panes (SheetView *sv,
GnmCellPos const *frozen_top_left,
GnmCellPos const *unfrozen_top_left);
-void sv_panes_insdel_colrow (SheetView *sv, gboolean is_cols,
+void gnm_sheet_view_panes_insdel_colrow (SheetView *sv, gboolean is_cols,
gboolean is_insert, int start, int count);
-void sv_set_initial_top_left(SheetView *sv, int col, int row);
+void gnm_sheet_view_set_initial_top_left(SheetView *sv, int col, int row);
#define SHEET_VIEW_FOREACH_CONTROL(sv, control, code) \
do { \
diff --git a/src/sheet.c b/src/sheet.c
index 9f53d80..caff828 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -1303,7 +1303,7 @@ gnm_sheet_resize_main (Sheet *sheet, int cols, int rows,
if (!any)
sv_selection_add_pos (sv, 0, 0,
GNM_SELECTION_MODE_ADD);
- sv_make_cell_visible (sv, vis.col, vis.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, vis.col, vis.row, FALSE);
});
/* ---------------------------------------- */
@@ -1885,7 +1885,7 @@ void
sheet_flag_status_update_cell (GnmCell const *cell)
{
SHEET_FOREACH_VIEW (cell->base.sheet, sv,
- sv_flag_status_update_pos (sv, &cell->pos););
+ gnm_sheet_view_flag_status_update_pos (sv, &cell->pos););
}
/**
@@ -1904,7 +1904,7 @@ void
sheet_flag_status_update_range (Sheet const *sheet, GnmRange const *range)
{
SHEET_FOREACH_VIEW (sheet, sv,
- sv_flag_status_update_range (sv, range););
+ gnm_sheet_view_flag_status_update_range (sv, range););
}
/**
@@ -1918,7 +1918,7 @@ void
sheet_flag_style_update_range (Sheet const *sheet, GnmRange const *range)
{
SHEET_FOREACH_VIEW (sheet, sv,
- sv_flag_style_update_range (sv, range););
+ gnm_sheet_view_flag_style_update_range (sv, range););
}
/**
@@ -2025,11 +2025,10 @@ sheet_update_only_grid (Sheet const *sheet)
if (p->reposition_objects.row < gnm_sheet_get_max_rows (sheet) ||
p->reposition_objects.col < gnm_sheet_get_max_cols (sheet)) {
SHEET_FOREACH_VIEW (sheet, sv, {
- if (!p->resize && sv_is_frozen (sv)) {
+ if (!p->resize && gnm_sheet_view_is_frozen (sv)) {
if (p->reposition_objects.col < sv->unfrozen_top_left.col ||
p->reposition_objects.row < sv->unfrozen_top_left.row) {
- SHEET_VIEW_FOREACH_CONTROL(sv, control,
- sc_resize (control, FALSE););
+ gnm_sheet_view_resize (sv, FALSE);
}
}
});
@@ -2040,7 +2039,7 @@ sheet_update_only_grid (Sheet const *sheet)
if (p->resize) {
p->resize = FALSE;
- SHEET_FOREACH_CONTROL (sheet, sv, control, sc_resize (control, FALSE););
+ SHEET_FOREACH_VIEW (sheet, sv, { gnm_sheet_view_resize (sv, FALSE); });
}
if (p->recompute_visibility) {
@@ -2083,7 +2082,7 @@ sheet_update (Sheet const *sheet)
sheet_update_only_grid (sheet);
- SHEET_FOREACH_VIEW (sheet, sv, sv_update (sv););
+ SHEET_FOREACH_VIEW (sheet, sv, gnm_sheet_view_update (sv););
}
/**
@@ -2208,7 +2207,7 @@ sheet_colrow_group_ungroup (Sheet *sheet, GnmRange const *r,
sheet_colrow_gutter (sheet, is_cols, new_max);
SHEET_FOREACH_VIEW (sheet, sv,
- sv_redraw_headers (sv, is_cols, !is_cols, NULL););
+ gnm_sheet_view_redraw_headers (sv, is_cols, !is_cols, NULL););
return TRUE;
}
@@ -5290,12 +5289,12 @@ sheet_insdel_colrow (Sheet *sheet, int pos, int count,
/* WARNING WARNING WARNING
* This is bad practice and should not really be here.
* However, we need to ensure that update is run before
- * sv_panes_insdel_colrow plays with frozen panes, updating those can
+ * gnm_sheet_view_panes_insdel_colrow plays with frozen panes, updating those can
* trigger redraws before sheet_update has been called. */
sheet_update (sheet);
SHEET_FOREACH_VIEW (sheet, sv,
- sv_panes_insdel_colrow (sv, is_cols, is_insert, pos, count););
+ gnm_sheet_view_panes_insdel_colrow (sv, is_cols, is_insert, pos, count););
/* The main undo is the opposite operation. */
if (pundo) {
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 24ea3d3..fac2e00 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -244,7 +244,7 @@ static GNM_ACTION_DEF (cb_file_print_area_show)
wb_control_sheet_focus (GNM_WBC (wbcg), sheet);
sv_selection_reset (sv);
sv_selection_add_range (sv, r);
- sv_make_cell_visible (sv, r->start.col, r->start.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, r->start.col, r->start.row, FALSE);
g_free (r);
}
}
@@ -423,7 +423,7 @@ static GNM_ACTION_DEF (cb_edit_cut)
gnm_app_clipboard_cut_copy_obj (wbc, TRUE, sv,
go_hash_keys (scg->selected_objects));
else
- sv_selection_cut (sv, wbc);
+ gnm_sheet_view_selection_cut (sv, wbc);
} else
gtk_editable_cut_clipboard (GTK_EDITABLE (wbcg_get_entry (wbcg)));
}
@@ -438,7 +438,7 @@ static GNM_ACTION_DEF (cb_edit_copy)
gnm_app_clipboard_cut_copy_obj (wbc, FALSE, sv,
go_hash_keys (scg->selected_objects));
else
- sv_selection_copy (sv, wbc);
+ gnm_sheet_view_selection_copy (sv, wbc);
} else
gtk_editable_copy_clipboard (GTK_EDITABLE (wbcg_get_entry (wbcg)));
}
@@ -480,7 +480,7 @@ common_cell_goto (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
sv_selection_set (sv, pos,
pos->col, pos->row,
pos->col, pos->row);
- sv_make_cell_visible (sv, pos->col, pos->row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, pos->col, pos->row, FALSE);
}
static int
@@ -767,9 +767,9 @@ static GNM_ACTION_DEF (cb_view_freeze_panes)
g_return_if_fail (unfrozen_tl.col > frozen_tl.col ||
unfrozen_tl.row > frozen_tl.row);
- sv_freeze_panes (sv, &frozen_tl, &unfrozen_tl);
+ gnm_sheet_view_freeze_panes (sv, &frozen_tl, &unfrozen_tl);
} else
- sv_freeze_panes (sv, NULL, NULL);
+ gnm_sheet_view_freeze_panes (sv, NULL, NULL);
}
/****************************************************************************/
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 861c79a..33b786f 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -438,7 +438,7 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
/* Redraw the cell contents in case there was a span */
GnmRange tmp; tmp.start = tmp.end = sv->edit_pos;
sheet_range_bounding_box (sv->sheet, &tmp);
- sv_redraw_range (wb_control_cur_sheet_view (wbc), &tmp);
+ gnm_sheet_view_redraw_range (wb_control_cur_sheet_view (wbc), &tmp);
}
/* Reload the entry widget with the original contents */
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 41c11d5..bec22f0 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1596,18 +1596,18 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
if (MS_FREEZE_VS_THAW & flags) {
/* Cheat and use the same accelerator for both states because
* we don't reset it when the label changes */
- char const* label = sv_is_frozen (sv)
+ char const* label = gnm_sheet_view_is_frozen (sv)
? _("Un_freeze Panes")
: _("_Freeze Panes");
- char const *new_tip = sv_is_frozen (sv)
+ char const *new_tip = gnm_sheet_view_is_frozen (sv)
? _("Unfreeze the top left of the sheet")
: _("Freeze the top left of the sheet");
wbc_gtk_set_action_label (wbcg, "ViewFreezeThawPanes", NULL, label, new_tip);
}
if (MS_ADD_VS_REMOVE_FILTER & flags) {
- gboolean const has_filter = (NULL != sv_editpos_in_filter (sv));
- GnmFilter *f = sv_selection_intersects_filter_rows (sv);
+ gboolean const has_filter = (NULL != gnm_sheet_view_editpos_in_filter (sv));
+ GnmFilter *f = gnm_sheet_view_selection_intersects_filter_rows (sv);
char const* label;
char const *new_tip;
gboolean active = TRUE;
@@ -1615,7 +1615,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
if ((!has_filter) && (NULL != f)) {
gchar *nlabel = NULL;
- if (NULL != (r = sv_selection_extends_filter (sv, f))) {
+ if (NULL != (r = gnm_sheet_view_selection_extends_filter (sv, f))) {
active = TRUE;
nlabel = g_strdup_printf
(_("Extend _Auto Filter to %s"),
@@ -1722,7 +1722,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, int flags)
N_("Repeat Export"), N_("Repeat the last data export"));
}
{
- gboolean const has_slicer = (NULL != sv_editpos_in_slicer (sv));
+ gboolean const has_slicer = (NULL != gnm_sheet_view_editpos_in_slicer (sv));
char const* label = has_slicer
? _("Remove _Data Slicer")
: _("Create _Data Slicer");
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 32cb0cd..65b02fd 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -1441,7 +1441,7 @@ cb_gee_key_press_event (GtkEntry *entry,
/* invalidate, in case Enter direction changes */
if (is_enter)
sv->first_tab_col = -1;
- sv_update (sv);
+ gnm_sheet_view_update (sv);
}
}
return TRUE;
diff --git a/src/workbook-control.c b/src/workbook-control.c
index 0f2db04..891a5e0 100644
--- a/src/workbook-control.c
+++ b/src/workbook-control.c
@@ -290,9 +290,9 @@ wb_control_jump (WorkbookControl *wbc, Sheet *sheet, const GnmRangeRef *r)
tmp.col = r->a.col;
tmp.row = r->a.row;
sv_selection_set (sv, &tmp, r->a.col, r->a.row, r->b.col, r->b.row);
- sv_make_cell_visible (sv, r->b.col, r->b.row, FALSE);
- sv_make_cell_visible (sv, r->a.col, r->a.row, FALSE);
- sv_update (sv);
+ gnm_sheet_view_make_cell_visible (sv, r->b.col, r->b.row, FALSE);
+ gnm_sheet_view_make_cell_visible (sv, r->a.col, r->a.row, FALSE);
+ gnm_sheet_view_update (sv);
if (wb_control_cur_sheet (wbc) != sheet)
wb_view_sheet_focus (wbc->wb_view, sheet);
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 4764452..c88bf62 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -197,7 +197,7 @@ wb_view_sheet_add (WorkbookView *wbv, Sheet *new_sheet)
g_return_if_fail (GNM_IS_WORKBOOK_VIEW (wbv));
- new_view = sheet_view_new (new_sheet, wbv);
+ new_view = gnm_sheet_view_new (new_sheet, wbv);
WORKBOOK_VIEW_FOREACH_CONTROL (wbv, control,
wb_control_sheet_add (control, new_view););
@@ -393,7 +393,7 @@ wb_view_selection_desc (WorkbookView *wbv, gboolean use_pos,
char const *sel_descr = buffer;
GnmRange const *r, *m;
- g_return_if_fail (GNM_IS_SV (sv));
+ g_return_if_fail (GNM_IS_SHEET_VIEW (sv));
g_return_if_fail (sv->selections);
r = selection_first_range (sv, NULL, NULL);
diff --git a/src/workbook.c b/src/workbook.c
index 42081f3..89b23e6 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -788,7 +788,7 @@ workbook_detach_view (WorkbookView *wbv)
WORKBOOK_FOREACH_SHEET (wbv->wb, sheet, {
SheetView *sv = sheet_get_view (sheet, wbv);
- sv_dispose (sv);
+ gnm_sheet_view_dispose (sv);
});
g_ptr_array_remove (wbv->wb->wb_views, wbv);
@@ -1137,7 +1137,7 @@ workbook_sheet_delete (Sheet *sheet)
post_sheet_index_change (wb);
/* Clear the controls first, before we potentially update */
- SHEET_FOREACH_VIEW (sheet, view, sv_dispose (view););
+ SHEET_FOREACH_VIEW (sheet, view, gnm_sheet_view_dispose (view););
g_signal_emit_by_name (G_OBJECT (sheet), "detached_from_workbook", wb);
g_object_unref (sheet);
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index f1f2e2d..33f5d82 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -1281,7 +1281,7 @@ xml_sax_selection_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
GnmCellPos const pos = state->cell;
state->cell.col = state->cell.row = -1;
- sv_set_edit_pos (sheet_get_view (state->sheet, state->wb_view), &pos);
+ gnm_sheet_view_set_edit_pos (sheet_get_view (state->sheet, state->wb_view), &pos);
}
static void
@@ -1294,7 +1294,7 @@ xml_sax_sheet_layout (GsfXMLIn *xin, xmlChar const **attrs)
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (xml_sax_attr_cellpos (attrs, "TopLeft", &tmp, state->sheet))
- sv_set_initial_top_left (
+ gnm_sheet_view_set_initial_top_left (
sheet_get_view (state->sheet, state->wb_view),
tmp.col, tmp.row);
else
@@ -1319,7 +1319,7 @@ xml_sax_sheet_freezepanes (GsfXMLIn *xin, xmlChar const **attrs)
unknown_attr (xin, attrs);
if (flags == 3)
- sv_freeze_panes (sheet_get_view (state->sheet, state->wb_view),
+ gnm_sheet_view_freeze_panes (sheet_get_view (state->sheet, state->wb_view),
&frozen_tl, &unfrozen_tl);
}
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index 6908630..03af5af 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -967,7 +967,7 @@ xml_write_sheet_layout (GnmOutputXML *state)
gsf_xml_out_start_element (state->output, GNM "SheetLayout");
gnm_xml_out_add_cellpos (state->output, "TopLeft", &sv->initial_top_left);
- if (sv_is_frozen (sv)) {
+ if (gnm_sheet_view_is_frozen (sv)) {
gsf_xml_out_start_element (state->output, GNM "FreezePanes");
gnm_xml_out_add_cellpos (state->output, "FrozenTopLeft", &sv->frozen_top_left);
gnm_xml_out_add_cellpos (state->output, "UnfrozenTopLeft", &sv->unfrozen_top_left);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
