[gnumeric] Namespace
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Namespace
- Date: Sat, 28 Feb 2015 23:39:51 +0000 (UTC)
commit 3a9b2aa09ec97fa2c8a9b3c78c32ed6758f40cf9
Author: Morten Welinder <terra gnome org>
Date: Sat Feb 28 18:39:34 2015 -0500
Namespace
component/gnumeric.c | 6 +-
plugins/excel/ms-chart.c | 2 +-
plugins/html/html.c | 2 +-
plugins/perl-loader/perl-loader.c | 6 +-
plugins/python-loader/py-gnumeric.c | 2 +-
plugins/python-loader/python-loader.c | 16 +-
src/commands.c | 34 ++--
src/dialogs/dialog-advanced-filter.c | 8 +-
src/dialogs/dialog-analysis-tool-chi-squared.c | 2 +-
src/dialogs/dialog-analysis-tool-frequency.c | 2 +-
src/dialogs/dialog-analysis-tool-kaplan-meier.c | 4 +-
src/dialogs/dialog-analysis-tool-normality.c | 2 +-
src/dialogs/dialog-analysis-tool-one-mean.c | 2 +-
.../dialog-analysis-tool-principal-components.c | 2 +-
src/dialogs/dialog-analysis-tool-sign-test.c | 4 +-
.../dialog-analysis-tool-wilcoxon-mann-whitney.c | 4 +-
src/dialogs/dialog-analysis-tools.c | 50 +++---
src/dialogs/dialog-autofilter.c | 4 +-
src/dialogs/dialog-autoformat.c | 4 +-
src/dialogs/dialog-autosave.c | 4 +-
src/dialogs/dialog-cell-comment.c | 2 +-
src/dialogs/dialog-cell-format-cond.c | 4 +-
src/dialogs/dialog-cell-format.c | 6 +-
src/dialogs/dialog-cell-sort.c | 6 +-
src/dialogs/dialog-col-width.c | 6 +-
src/dialogs/dialog-consolidate.c | 4 +-
src/dialogs/dialog-data-slicer.c | 2 +-
src/dialogs/dialog-data-table.c | 6 +-
src/dialogs/dialog-define-names.c | 16 +-
src/dialogs/dialog-delete-cells.c | 4 +-
src/dialogs/dialog-doc-metadata.c | 12 +-
src/dialogs/dialog-fill-series.c | 4 +-
src/dialogs/dialog-formula-guru.c | 4 +-
src/dialogs/dialog-function-select.c | 2 +-
src/dialogs/dialog-goal-seek.c | 6 +-
src/dialogs/dialog-goto-cell.c | 18 +-
src/dialogs/dialog-hyperlink.c | 10 +-
src/dialogs/dialog-insert-cells.c | 4 +-
src/dialogs/dialog-merge.c | 6 +-
src/dialogs/dialog-paste-special.c | 6 +-
src/dialogs/dialog-plugin-manager.c | 2 +-
src/dialogs/dialog-printer-setup.c | 10 +-
src/dialogs/dialog-quit.c | 2 +-
src/dialogs/dialog-random-generator-cor.c | 2 +-
src/dialogs/dialog-random-generator.c | 4 +-
src/dialogs/dialog-row-height.c | 6 +-
src/dialogs/dialog-scenarios.c | 12 +-
src/dialogs/dialog-search-replace.c | 4 +-
src/dialogs/dialog-search.c | 6 +-
src/dialogs/dialog-sheet-order.c | 44 +++---
src/dialogs/dialog-sheet-rename.c | 2 +-
src/dialogs/dialog-sheet-resize.c | 2 +-
src/dialogs/dialog-sheetobject-size.c | 6 +-
src/dialogs/dialog-shuffle.c | 6 +-
src/dialogs/dialog-simulation.c | 4 +-
src/dialogs/dialog-so-list.c | 2 +-
src/dialogs/dialog-so-styled.c | 2 +-
src/dialogs/dialog-solver.c | 10 +-
src/dialogs/dialog-stf-export.c | 2 +-
src/dialogs/dialog-stf-format-page.c | 2 +-
src/dialogs/dialog-tabulate.c | 2 +-
src/dialogs/dialog-view.c | 4 +-
src/dialogs/dialog-workbook-attr.c | 4 +-
src/dialogs/dialog-zoom.c | 4 +-
src/gnm-pane.c | 18 +-
src/gnm-pane.h | 2 +-
src/gnm-plugin.c | 24 ++--
src/gnm-plugin.h | 6 +-
src/gnm-sheet-slicer.c | 18 +-
src/gnm-sheet-slicer.h | 2 +-
src/gnm-so-polygon.h | 2 +-
src/graph.c | 4 +-
src/graph.h | 4 +-
src/gui-clipboard.c | 10 +-
src/gui-file.c | 12 +-
src/gui-util.c | 6 +-
src/hlink.c | 12 +-
src/hlink.h | 4 +-
src/input-msg.h | 2 +-
src/print.c | 8 +-
src/search.h | 2 +-
src/sheet-control-gui.c | 14 +-
src/sheet-object-component.c | 2 +-
src/sheet-object-graph.c | 4 +-
src/sheet-object-widget.c | 10 +-
src/sheet-object.c | 6 +-
src/ssconvert.c | 4 +-
src/stf-export.c | 12 +-
src/stf-export.h | 2 +-
src/stf.c | 6 +-
src/wbc-gtk-actions.c | 186 ++++++++++----------
src/wbc-gtk-edit.c | 46 +++---
src/wbc-gtk-impl.h | 2 +-
src/wbc-gtk.c | 132 +++++++-------
src/wbc-gtk.h | 6 +-
src/widgets/gnm-dao.c | 6 +-
src/widgets/gnm-filter-combo-view.c | 2 +-
src/widgets/gnm-sheet-slicer-combo-view.c | 2 +-
src/widgets/gnm-validation-combo-view.c | 2 +-
src/widgets/gnumeric-expr-entry.c | 4 +-
src/workbook-control-priv.h | 2 +-
src/workbook-control.c | 24 ++--
src/workbook-control.h | 6 +-
src/workbook-view.c | 4 +-
104 files changed, 526 insertions(+), 526 deletions(-)
---
diff --git a/component/gnumeric.c b/component/gnumeric.c
index 21d26fb..026d1f6 100644
--- a/component/gnumeric.c
+++ b/component/gnumeric.c
@@ -179,7 +179,7 @@ cb_gognm_save (G_GNUC_UNUSED GtkAction *a, WBCGtk *wbcg)
GOComponent *component = GO_COMPONENT (data);
/* update the component data since not all clients will call set_data */
GOGnmComponent *gognm = GO_GNM_COMPONENT (component);
- WorkbookView *wv = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wv = wb_control_view (GNM_WBC (wbcg));
if (wv != gognm->wv) {
if (gognm->wv != NULL) {
g_object_unref (gognm->wv);
@@ -193,7 +193,7 @@ cb_gognm_save (G_GNUC_UNUSED GtkAction *a, WBCGtk *wbcg)
go_gnm_component_update_data (gognm);
go_component_emit_changed (component);
} else
- gui_file_save (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)));
+ gui_file_save (wbcg, wb_control_view (GNM_WBC (wbcg)));
}
static GtkActionEntry const actions[] = {
@@ -253,7 +253,7 @@ go_gnm_component_finalize (GObject *obj)
gognm->wv = NULL;
}
if (gognm->edited != NULL) {
- g_object_unref (wb_control_view (WORKBOOK_CONTROL (gognm->edited)));
+ g_object_unref (wb_control_view (GNM_WBC (gognm->edited)));
gognm->edited = NULL;
}
G_OBJECT_CLASS (gognm_parent_klass)->finalize (obj);
diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c
index 3855e7b..e49a2f0 100644
--- a/plugins/excel/ms-chart.c
+++ b/plugins/excel/ms-chart.c
@@ -4247,7 +4247,7 @@ chart_write_AI (XLChartWriteState *s, GOData const *dim, unsigned n,
gboolean need_release = FALSE;
if (dim != NULL) {
- if (IS_GNM_GO_DATA_SCALAR (dim) || IS_GNM_GO_DATA_VECTOR (dim)) {
+ if (IS_GNM_GO_DATA_SCALAR (dim) || GNM_IS_GO_DATA_VECTOR (dim)) {
texpr = gnm_go_data_get_expr (dim);
if ((value = gnm_expr_top_get_range (texpr)) != NULL) {
GType const t = G_OBJECT_TYPE (dim);
diff --git a/plugins/html/html.c b/plugins/html/html.c
index 7ae9c53..02df6fa 100644
--- a/plugins/html/html.c
+++ b/plugins/html/html.c
@@ -285,7 +285,7 @@ html_write_cell_content (GsfOutput *output, GnmCell *cell, GnmStyle const *style
GnmHLink* hlink = gnm_style_get_hlink (style);
const guchar* hlink_target = NULL;
- if (hlink && IS_GNM_HLINK_URL (hlink)) {
+ if (hlink && GNM_IS_HLINK_URL (hlink)) {
hlink_target = gnm_hlink_get_target (hlink);
}
diff --git a/plugins/perl-loader/perl-loader.c b/plugins/perl-loader/perl-loader.c
index ce16da1..571adf9 100644
--- a/plugins/perl-loader/perl-loader.c
+++ b/plugins/perl-loader/perl-loader.c
@@ -319,7 +319,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
{
PluginServiceFunctionGroupCallbacks *cbs;
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service));
GO_INIT_RET_ERROR_INFO (ret_error);
@@ -330,7 +330,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
static gboolean
gplp_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
{
- if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
+ if (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (s))
gplp_load_service_function_group (l, s, err);
else
return FALSE;
@@ -340,7 +340,7 @@ gplp_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
static gboolean
gplp_service_unload (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
{
- if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
+ if (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (s))
;
else
return FALSE;
diff --git a/plugins/python-loader/py-gnumeric.c b/plugins/python-loader/py-gnumeric.c
index 6a3e04e..feea080 100644
--- a/plugins/python-loader/py-gnumeric.c
+++ b/plugins/python-loader/py-gnumeric.c
@@ -1833,7 +1833,7 @@ py_Gui_get_workbook (py_Gui_object *self, PyObject *args)
return NULL;
}
- workbook = wb_control_get_workbook (WORKBOOK_CONTROL (self->wbcg));
+ workbook = wb_control_get_workbook (GNM_WBC (self->wbcg));
return py_new_Workbook_object (workbook);
}
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index 870c5f6..3792823 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -652,7 +652,7 @@ gplp_func_desc_load (GOPluginService *service,
ServiceLoaderDataFunctionGroup *loader_data;
PyObject *fn_info_obj;
- g_return_val_if_fail (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service), FALSE);
+ g_return_val_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service), FALSE);
g_return_val_if_fail (name != NULL, FALSE);
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
@@ -713,7 +713,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
gchar *fn_info_dict_name;
PyObject *python_fn_info_dict;
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service));
GO_INIT_RET_ERROR_INFO (ret_error);
gnm_py_interpreter_switch_to (loader_python->py_interpreter_info);
@@ -762,7 +762,7 @@ gplp_unload_service_function_group (GOPluginLoader *loader,
ServiceLoaderDataFunctionGroup *loader_data;
g_return_if_fail (IS_GNM_PYTHON_PLUGIN_LOADER (loader));
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service));
GO_INIT_RET_ERROR_INFO (ret_error);
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
@@ -825,7 +825,7 @@ gplp_load_service_ui (GOPluginLoader *loader,
gchar *ui_action_names;
PyObject *ui_actions;
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_UI (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_UI (service));
GO_INIT_RET_ERROR_INFO (ret_error);
gnm_py_interpreter_switch_to (loader_python->py_interpreter_info);
@@ -869,9 +869,9 @@ gplp_load_service_ui (GOPluginLoader *loader,
static gboolean
gplp_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
{
- if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
+ if (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (s))
gplp_load_service_function_group (l, s, err);
- else if (IS_GNM_PLUGIN_SERVICE_UI (s))
+ else if (GNM_IS_PLUGIN_SERVICE_UI (s))
gplp_load_service_ui (l, s, err);
else
return FALSE;
@@ -881,9 +881,9 @@ gplp_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
static gboolean
gplp_service_unload (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
{
- if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
+ if (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (s))
;
- else if (IS_GNM_PLUGIN_SERVICE_UI (s))
+ else if (GNM_IS_PLUGIN_SERVICE_UI (s))
gplp_unload_service_function_group (l, s, err);
else
return FALSE;
diff --git a/src/commands.c b/src/commands.c
index 8461ba9..519dfbd 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -3051,7 +3051,7 @@ cmd_paste_copy_impl (GnmCommand *cmd, WorkbookControl *wbc,
me->has_been_through_cycle = TRUE;
/* Select the newly pasted contents (this queues a redraw) */
- if (me->only_objects && IS_WBC_GTK (wbc)) {
+ if (me->only_objects && GNM_IS_WBC_GTK (wbc)) {
SheetControlGUI *scg =
wbcg_get_nth_scg (WBC_GTK (wbc),
cmd->sheet->index_in_wb);
@@ -4700,7 +4700,7 @@ cmd_objects_delete (WorkbookControl *wbc, GSList *objects,
{
CmdObjectsDelete *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
g_return_val_if_fail (objects != NULL, TRUE);
me = g_object_new (CMD_OBJECTS_DELETE_TYPE, NULL);
@@ -4738,7 +4738,7 @@ cmd_objects_move (WorkbookControl *wbc, GSList *objects, GSList *anchors,
GOUndo *redo = NULL;
gboolean result = TRUE;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
undo = sheet_object_move_undo (objects, objects_created);
redo = sheet_object_move_do (objects, anchors, objects_created);
@@ -6261,7 +6261,7 @@ cmd_scenario_add (WorkbookControl *wbc, GnmScenario *s, Sheet *sheet)
{
CmdScenarioAdd *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
g_return_val_if_fail (IS_SHEET (sheet), TRUE);
me = g_object_new (CMD_SCENARIO_ADD_TYPE, NULL);
@@ -6324,7 +6324,7 @@ cmd_scenario_mngr (WorkbookControl *wbc, GnmScenario *sc, GOUndo *undo)
{
CmdScenarioMngr *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
g_return_val_if_fail (GNM_IS_SCENARIO (sc), TRUE);
me = g_object_new (CMD_SCENARIO_MNGR_TYPE, NULL);
@@ -6383,7 +6383,7 @@ cmd_data_shuffle (WorkbookControl *wbc, data_shuffling_t *sc, Sheet *sheet)
{
CmdDataShuffle *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
g_return_val_if_fail (IS_SHEET (sheet), TRUE);
me = g_object_new (CMD_DATA_SHUFFLE_TYPE, NULL);
@@ -6876,7 +6876,7 @@ cmd_so_graph_config (WorkbookControl *wbc, SheetObject *so,
{
CmdSOGraphConfig *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
g_return_val_if_fail (GNM_IS_SO_GRAPH (so), TRUE);
g_return_val_if_fail (GOG_IS_GRAPH (n_graph), TRUE);
g_return_val_if_fail (GOG_IS_GRAPH (o_graph), TRUE);
@@ -6948,7 +6948,7 @@ cmd_so_component_config (WorkbookControl *wbc, SheetObject *so,
{
CmdSOComponentConfig *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
g_return_val_if_fail (GNM_IS_SO_COMPONENT (so), TRUE);
g_return_val_if_fail (GO_IS_COMPONENT (n_obj), TRUE);
g_return_val_if_fail (GO_IS_COMPONENT (o_obj), TRUE);
@@ -7001,7 +7001,7 @@ cmd_toggle_rtl (WorkbookControl *wbc, Sheet *sheet)
{
CmdToggleRTL *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
g_return_val_if_fail (IS_SHEET (sheet), TRUE);
me = g_object_new (CMD_TOGGLE_RTL_TYPE, NULL);
@@ -7070,7 +7070,7 @@ cmd_so_set_value (WorkbookControl *wbc,
CmdSOSetValue *me;
GnmRange r;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
r.start.col = r.end.col = pref->col;
r.start.row = r.end.row = pref->row;
@@ -7340,7 +7340,7 @@ cmd_so_set_links (WorkbookControl *wbc,
{
CmdSOSetLink *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
me = g_object_new (CMD_SO_SET_LINKS_TYPE, NULL);
me->cmd.sheet = sheet_object_get_sheet (so);
@@ -7411,7 +7411,7 @@ cmd_so_set_frame_label (WorkbookControl *wbc,
{
CmdSOSetFrameLabel *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
me = g_object_new (CMD_SO_SET_FRAME_LABEL_TYPE, NULL);
me->cmd.sheet = sheet_object_get_sheet (so);
@@ -7482,7 +7482,7 @@ cmd_so_set_button (WorkbookControl *wbc,
{
CmdSOSetButton *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
me = g_object_new (CMD_SO_SET_BUTTON_TYPE, NULL);
me->cmd.sheet = sheet_object_get_sheet (so);
@@ -7563,7 +7563,7 @@ cmd_so_set_radio_button (WorkbookControl *wbc,
{
CmdSOSetRadioButton *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
me = g_object_new (CMD_SO_SET_RADIO_BUTTON_TYPE, NULL);
me->cmd.sheet = sheet_object_get_sheet (so);
@@ -7639,7 +7639,7 @@ cmd_so_set_checkbox (WorkbookControl *wbc,
{
CmdSOSetCheckbox *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
me = g_object_new (CMD_SO_SET_CHECKBOX_TYPE, NULL);
me->cmd.sheet = sheet_object_get_sheet (so);
@@ -7745,7 +7745,7 @@ cmd_so_set_adjustment (WorkbookControl *wbc,
{
CmdSOSetAdjustment *me;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
me = g_object_new (CMD_SO_SET_ADJUSTMENT_TYPE, NULL);
me->cmd.sheet = sheet_object_get_sheet (so);
@@ -7935,7 +7935,7 @@ cmd_page_breaks_clear (WorkbookControl *wbc, Sheet *sheet)
GOUndo *undo = NULL;
GOUndo *redo = NULL;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), TRUE);
g_return_val_if_fail (sheet != NULL, TRUE);
if (sheet->print_info->page_breaks.v != NULL) {
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index cd8d259..91acce6 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -129,17 +129,17 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
unique = (1 == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
if (dao->type == InPlaceOutput)
- err = advanced_filter (WORKBOOK_CONTROL (state->wbcg),
+ err = advanced_filter (GNM_WBC (state->wbcg),
dao, input, criteria, unique);
else {
analysis_tools_data_advanced_filter_t *
data = g_new0 (analysis_tools_data_advanced_filter_t, 1);
- data->base.wbc = WORKBOOK_CONTROL (state->wbcg);
+ data->base.wbc = GNM_WBC (state->wbcg);
data->base.range_1 = input;
data->base.range_2 = criteria;
data->unique_only_flag = unique;
- if (cmd_analysis_tool (WORKBOOK_CONTROL (state->wbcg), state->sheet,
+ if (cmd_analysis_tool (GNM_WBC (state->wbcg), state->sheet,
dao, data, analysis_tool_advanced_filter_engine, FALSE)) {
err = data->base.err;
g_free (data);
@@ -196,7 +196,7 @@ dialog_advanced_filter (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
- wbc = WORKBOOK_CONTROL (wbcg);
+ wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, ADVANCED_FILTER_KEY))
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index aff98d0..73e101b 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -85,7 +85,7 @@ chi_squared_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
(GNM_EXPR_ENTRY (state->base.input_entry),
state->base.sheet);
- data->wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ data->wbc = GNM_WBC (state->base.wbcg);
data->labels = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (state->label));
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index 99c5d5c..7b385dd 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -182,7 +182,7 @@ frequency_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->base.gui, "exact-button");
data->exact = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, analysis_tool_frequency_engine,
TRUE))
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 15e267c..7e224b4 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -253,7 +253,7 @@ kaplan_meier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
dao = parse_output ((GenericToolState *)state, NULL);
- data->base.wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ data->base.wbc = GNM_WBC (state->base.wbcg);
if (state->base.warning_dialog != NULL)
gtk_widget_destroy (state->base.warning_dialog);
@@ -295,7 +295,7 @@ kaplan_meier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data->std_err = gtk_toggle_button_get_active (
GTK_TOGGLE_BUTTON (state->std_error_button));
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, analysis_tool_kaplan_meier_engine,
TRUE))
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index 8974438..f804857 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -161,7 +161,7 @@ normality_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->base.gui, "normalprobabilityplot");
data->graph = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, analysis_tool_normality_engine,
TRUE))
diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c
index 57d4d26..1fe996a 100644
--- a/src/dialogs/dialog-analysis-tool-one-mean.c
+++ b/src/dialogs/dialog-analysis-tool-one-mean.c
@@ -153,7 +153,7 @@ one_mean_test_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data->alpha = gtk_spin_button_get_value
(GTK_SPIN_BUTTON (state->alpha_entry));
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, analysis_tool_one_mean_test_engine,
TRUE))
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c
b/src/dialogs/dialog-analysis-tool-principal-components.c
index e161123..1850dc8 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -122,7 +122,7 @@ principal_components_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->gui, "labels_button");
data->labels = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (cmd_analysis_tool (WORKBOOK_CONTROL (state->wbcg), state->sheet,
+ if (cmd_analysis_tool (GNM_WBC (state->wbcg), state->sheet,
dao, data,
analysis_tool_principal_components_engine,
TRUE)) {
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index 83be3f5..d9397d6 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -219,7 +219,7 @@ sign_test_two_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
? analysis_tool_sign_test_two_engine
: analysis_tool_signed_rank_test_two_engine;
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, engine, TRUE))
gtk_widget_destroy (state->base.dialog);
@@ -333,7 +333,7 @@ sign_test_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
? analysis_tool_sign_test_engine
: analysis_tool_signed_rank_test_engine;
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, engine, TRUE))
gtk_widget_destroy (state->base.dialog);
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index 8e91bca..4b85557 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -130,7 +130,7 @@ wilcoxon_mann_whitney_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data = g_new0 (analysis_tools_data_generic_b_t, 1);
dao = parse_output (state, NULL);
- data->wbc = WORKBOOK_CONTROL (state->wbcg);
+ data->wbc = GNM_WBC (state->wbcg);
data->range_1 = gnm_expr_entry_parse_as_value
(GNM_EXPR_ENTRY (state->input_entry), state->sheet);
@@ -141,7 +141,7 @@ wilcoxon_mann_whitney_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->gui, "labels_button");
data->labels = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (cmd_analysis_tool (WORKBOOK_CONTROL (state->wbcg), state->sheet,
+ if (cmd_analysis_tool (GNM_WBC (state->wbcg), state->sheet,
dao, data,
analysis_tool_wilcoxon_mann_whitney_engine, TRUE)) {
char *text;
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index 36f6212..9e3e68a 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -386,9 +386,9 @@ dialog_tool_init (GenericToolState *state,
GtkWidget *widget;
state->wbcg = wbcg;
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
state->sheet = sheet;
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->warning_dialog = NULL;
state->help_link = help_file;
state->state_destroy = NULL;
@@ -646,7 +646,7 @@ corr_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->gui, "labels_button");
data->labels = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (cmd_analysis_tool (WORKBOOK_CONTROL (state->wbcg), state->sheet,
+ if (cmd_analysis_tool (GNM_WBC (state->wbcg), state->sheet,
dao, data, analysis_tool_correlation_engine, FALSE)) {
switch (data->err - 1) {
@@ -766,7 +766,7 @@ cov_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->gui, "labels_button");
data->labels = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (cmd_analysis_tool (WORKBOOK_CONTROL (state->wbcg), state->sheet,
+ if (cmd_analysis_tool (GNM_WBC (state->wbcg), state->sheet,
dao, data, analysis_tool_covariance_engine, FALSE)) {
switch (data->err - 1) {
@@ -886,7 +886,7 @@ rank_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data->av_ties = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->wbcg), state->sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->wbcg), state->sheet,
dao, data, analysis_tool_ranking_engine, TRUE))
gtk_widget_destroy (state->dialog);
return;
@@ -967,7 +967,7 @@ fourier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data = g_new0 (analysis_tools_data_fourier_t, 1);
dao = parse_output (state, NULL);
- data->base.wbc = WORKBOOK_CONTROL (state->wbcg);
+ data->base.wbc = GNM_WBC (state->wbcg);
data->base.input = gnm_expr_entry_parse_as_list (
GNM_EXPR_ENTRY (state->input_entry), state->sheet);
data->base.group_by = gnm_gui_group_value (state->gui, grouped_by_group);
@@ -978,7 +978,7 @@ fourier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->gui, "inverse_button");
data->inverse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)) != 0;
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->wbcg), state->sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->wbcg), state->sheet,
dao, data, analysis_tool_fourier_engine, TRUE))
gtk_widget_destroy (state->dialog);
@@ -1087,7 +1087,7 @@ cb_desc_stat_tool_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->base.gui, "labels_button");
data->base.labels = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_descriptive_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
return;
@@ -1324,7 +1324,7 @@ ttest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data = g_new0 (analysis_tools_data_ttests_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
- data->base.wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ data->base.wbc = GNM_WBC (state->base.wbcg);
if (state->base.warning_dialog != NULL)
gtk_widget_destroy (state->base.warning_dialog);
@@ -1358,19 +1358,19 @@ ttest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
switch (state->invocation) {
case TTEST_PAIRED:
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, analysis_tool_ttest_paired_engine,
TRUE))
gtk_widget_destroy (state->base.dialog);
break;
case TTEST_UNPAIRED_EQUALVARIANCES:
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_ttest_eqvar_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
break;
case TTEST_UNPAIRED_UNEQUALVARIANCES:
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_ttest_neqvar_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
break;
@@ -1394,7 +1394,7 @@ ttest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
return;
}
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_ztest_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
break;
@@ -1711,7 +1711,7 @@ ftest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data = g_new0 (analysis_tools_data_generic_b_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
- data->wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ data->wbc = GNM_WBC (state->base.wbcg);
if (state->base.warning_dialog != NULL)
gtk_widget_destroy (state->base.warning_dialog);
@@ -1727,7 +1727,7 @@ ftest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
entry_to_float (GTK_ENTRY (state->alpha_entry), &data->alpha, TRUE);
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_ftest_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
@@ -1936,7 +1936,7 @@ sampling_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data = g_new0 (analysis_tools_data_sampling_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
- data->base.wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ data->base.wbc = GNM_WBC (state->base.wbcg);
data->base.input = gnm_expr_entry_parse_as_list (
GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
@@ -1957,7 +1957,7 @@ sampling_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
entry_to_int (GTK_ENTRY (state->number_entry), &data->number, TRUE);
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_sampling_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
return;
@@ -2176,7 +2176,7 @@ regression_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data = g_new0 (analysis_tools_data_regression_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
- data->base.wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ data->base.wbc = GNM_WBC (state->base.wbcg);
data->base.range_1 = gnm_expr_entry_parse_as_value (
GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
@@ -2206,7 +2206,7 @@ regression_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data->multiple_y = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (state->switch_variables_check));
- if (cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_regression_engine, FALSE)) {
char *text;
@@ -2531,7 +2531,7 @@ exp_smoothing_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data->es_type = gnm_gui_group_value (state->base.gui, exp_smoothing_group);
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_exponential_smoothing_engine,
TRUE))
gtk_widget_destroy (state->base.dialog);
@@ -2892,7 +2892,7 @@ average_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
break;
}
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_moving_average_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
@@ -3309,7 +3309,7 @@ histogram_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
w = go_gtk_builder_get_widget (state->base.gui, "only-num-button");
data->only_numbers = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_histogram_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
@@ -3472,7 +3472,7 @@ anova_single_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
data->alpha = gtk_spin_button_get_value
(GTK_SPIN_BUTTON (state->alpha_entry));
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg), state->base.sheet,
dao, data, analysis_tool_anova_single_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
@@ -3625,7 +3625,7 @@ anova_two_factor_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
(GNM_EXPR_ENTRY (state->base.input_entry),
state->base.sheet);
data->err = analysis_tools_noerr;
- data->wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ data->wbc = GNM_WBC (state->base.wbcg);
w = go_gtk_builder_get_widget (state->base.gui, "labels_button");
data->labels = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
@@ -3635,7 +3635,7 @@ anova_two_factor_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
entry_to_int (GTK_ENTRY (state->replication_entry),
&data->replication, TRUE);
- if (cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, analysis_tool_anova_two_factor_engine, FALSE)) {
switch (data->err) {
diff --git a/src/dialogs/dialog-autofilter.c b/src/dialogs/dialog-autofilter.c
index 5c9ff96..8c3947e 100644
--- a/src/dialogs/dialog-autofilter.c
+++ b/src/dialogs/dialog-autofilter.c
@@ -129,7 +129,7 @@ map_op (AutoFilterState *state, GnmFilterOp *op,
}
if (v == NULL) {
- Workbook *wb = wb_control_get_workbook (WORKBOOK_CONTROL (state->wbcg));
+ Workbook *wb = wb_control_get_workbook (GNM_WBC (state->wbcg));
v = format_match (txt, NULL, workbook_date_conv (wb));
}
if (v == NULL)
@@ -178,7 +178,7 @@ cb_autofilter_ok (G_GNUC_UNUSED GtkWidget *button,
count);
}
if (cond != NULL)
- cmd_autofilter_set_condition (WORKBOOK_CONTROL (state->wbcg),
+ cmd_autofilter_set_condition (GNM_WBC (state->wbcg),
state->filter, state->field,
cond);
diff --git a/src/dialogs/dialog-autoformat.c b/src/dialogs/dialog-autoformat.c
index 69e50a6..70fd1d3 100644
--- a/src/dialogs/dialog-autoformat.c
+++ b/src/dialogs/dialog-autoformat.c
@@ -361,7 +361,7 @@ cb_ok_clicked (G_GNUC_UNUSED GtkButton *button,
AutoFormatState *state)
{
if (state->selected_template)
- cmd_selection_autoformat (WORKBOOK_CONTROL (state->wbcg),
+ cmd_selection_autoformat (GNM_WBC (state->wbcg),
format_template_clone (state->selected_template));
gtk_widget_destroy (GTK_WIDGET (state->dialog));
@@ -518,7 +518,7 @@ dialog_autoformat (WBCGtk *wbcg)
return;
state = g_new0 (AutoFormatState, 1);
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
state->wbcg = wbcg;
state->templates = NULL;
state->category_groups = NULL;
diff --git a/src/dialogs/dialog-autosave.c b/src/dialogs/dialog-autosave.c
index 25eea87..5f6fadb 100644
--- a/src/dialogs/dialog-autosave.c
+++ b/src/dialogs/dialog-autosave.c
@@ -68,7 +68,7 @@ gboolean
dialog_autosave_prompt (WBCGtk *wbcg)
{
char const *uri = go_doc_get_uri (
- wb_control_get_doc (WORKBOOK_CONTROL (wbcg)));
+ wb_control_get_doc (GNM_WBC (wbcg)));
GtkWidget *dialog = gtk_message_dialog_new (wbcg_toplevel (wbcg),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
@@ -135,7 +135,7 @@ dialog_autosave (WBCGtk *wbcg)
state = g_new (autosave_t, 1);
state->wbcg = wbcg;
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
state->dialog = go_gtk_builder_get_widget (gui, "AutoSave");
state->minutes_entry = go_gtk_builder_get_widget (gui, "minutes");
diff --git a/src/dialogs/dialog-cell-comment.c b/src/dialogs/dialog-cell-comment.c
index 9089cbd..6b427b1 100644
--- a/src/dialogs/dialog-cell-comment.c
+++ b/src/dialogs/dialog-cell-comment.c
@@ -74,7 +74,7 @@ cb_cell_comment_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
(state->gui, "new-author-entry")));
g_object_get (G_OBJECT (state->gtv), "text", &text,
"attributes", &attr, NULL);
- if (!cmd_set_comment (WORKBOOK_CONTROL (state->wbcg),
+ if (!cmd_set_comment (GNM_WBC (state->wbcg),
state->sheet, state->pos, text, attr, author))
gtk_widget_destroy (state->dialog);
g_free (text);
diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c
index fadf6be..23ca628 100644
--- a/src/dialogs/dialog-cell-format-cond.c
+++ b/src/dialogs/dialog-cell-format-cond.c
@@ -691,7 +691,7 @@ c_fmt_dialog_set_conditions (CFormatState *state, char const *cmd_label)
(GnmSelectionFunc)c_fmt_dialog_condition_setter_tiled,
state);
}
- cmd_generic_with_size (WORKBOOK_CONTROL (state->wbcg), cmd_label,
+ cmd_generic_with_size (GNM_WBC (state->wbcg), cmd_label,
state->action.size, state->action.undo, state->action.redo);
state->action.undo = NULL;
@@ -1306,7 +1306,7 @@ dialog_cell_format_cond (WBCGtk *wbcg)
state = g_new (CFormatState, 1);
state->wbcg = wbcg;
state->gui = gui;
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->sheet = sv_sheet (state->sv);
state->style = NULL;
state->editor.style = NULL;
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 27a0126..b6ee4d8 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -2068,7 +2068,7 @@ cb_fmt_dialog_dialog_buttons (GtkWidget *btn, FormatState *state)
/* since we are acting on the current selection */
/* validation may have switched sheets. */
- wb_control_sheet_focus (WORKBOOK_CONTROL (state->wbcg),
+ wb_control_sheet_focus (GNM_WBC (state->wbcg),
state->sheet);
if (state->validation.changed)
@@ -2119,7 +2119,7 @@ cb_fmt_dialog_dialog_buttons (GtkWidget *btn, FormatState *state)
GnmBorder *borders[GNM_STYLE_BORDER_EDGE_MAX];
for (i = GNM_STYLE_BORDER_TOP; i < GNM_STYLE_BORDER_EDGE_MAX; i++)
borders[i] = border_get_mstyle (state, i);
- cmd_selection_format (WORKBOOK_CONTROL (state->wbcg),
+ cmd_selection_format (GNM_WBC (state->wbcg),
state->result, borders, NULL);
}
/* state->result got absorbed. */
@@ -2560,7 +2560,7 @@ dialog_cell_format_init (WBCGtk *wbcg)
state = g_new (FormatState, 1);
state->wbcg = wbcg;
state->gui = gui;
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->sheet = sv_sheet (state->sv);
edit_cell = sheet_cell_get (state->sheet,
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index 9268372..fec2049 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -505,7 +505,7 @@ cb_dialog_ok_clicked (SortFlowState *state)
g_strdup((text != NULL && text[0] != '\0') ? text : "Other"),
data_copy);
- cmd_sort (WORKBOOK_CONTROL (state->wbcg), data);
+ cmd_sort (GNM_WBC (state->wbcg), data);
gtk_widget_destroy (state->dialog);
return;
@@ -1160,8 +1160,8 @@ dialog_cell_sort (WBCGtk *wbcg)
state = g_new (SortFlowState, 1);
state->wbcg = wbcg;
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->sheet = sv_sheet (state->sv);
state->warning_dialog = NULL;
state->sel = NULL;
diff --git a/src/dialogs/dialog-col-width.c b/src/dialogs/dialog-col-width.c
index cef5650..6938dbb 100644
--- a/src/dialogs/dialog-col-width.c
+++ b/src/dialogs/dialog-col-width.c
@@ -189,14 +189,14 @@ cb_dialog_col_width_apply_clicked (G_GNUC_UNUSED GtkWidget *button,
if (state->set_default_value) {
double points = value * 72./gnm_app_display_dpi_get (FALSE);
- cmd_colrow_std_size (WORKBOOK_CONTROL (state->wbcg),
+ cmd_colrow_std_size (GNM_WBC (state->wbcg),
state->sheet, TRUE, points);
dialog_col_width_load_value (state);
} else {
if (use_default)
size_pixels = 0;
- workbook_cmd_resize_selected_colrow (WORKBOOK_CONTROL (state->wbcg),
+ workbook_cmd_resize_selected_colrow (GNM_WBC (state->wbcg),
state->sheet, TRUE, size_pixels);
dialog_col_width_load_value (state);
}
@@ -252,7 +252,7 @@ dialog_col_width (WBCGtk *wbcg, gboolean use_default)
state = g_new (ColWidthState, 1);
state->wbcg = wbcg;
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->sheet = sv_sheet (state->sv);
state->adjusting = FALSE;
state->dialog = go_gtk_builder_get_widget (gui, "dialog");
diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c
index e46646c..23b38b1 100644
--- a/src/dialogs/dialog-consolidate.c
+++ b/src/dialogs/dialog-consolidate.c
@@ -312,7 +312,7 @@ cb_consolidate_ok_clicked (GtkWidget *button, ConsolidateState *state)
}
if (consolidate_check_destination (cs, dao)) {
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, cs, tool_consolidate_engine,
FALSE) &&
@@ -533,7 +533,7 @@ dialog_consolidate (WBCGtk *wbcg)
Sheet *sheet;
g_return_if_fail (wbcg != NULL);
- sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
sheet = sv_sheet (sv);
/* Only pop up one copy per workbook */
diff --git a/src/dialogs/dialog-data-slicer.c b/src/dialogs/dialog-data-slicer.c
index 58193ea..486c09b 100644
--- a/src/dialogs/dialog-data-slicer.c
+++ b/src/dialogs/dialog-data-slicer.c
@@ -233,7 +233,7 @@ dialog_data_slicer (WBCGtk *wbcg, gboolean create)
state = g_new0 (DialogDataSlicer, 1);
state->wbcg = wbcg;
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->dialog = go_gtk_builder_get_widget (gui, "dialog_data_slicer");
state->notebook = go_gtk_builder_get_widget (gui, "notebook");
diff --git a/src/dialogs/dialog-data-table.c b/src/dialogs/dialog-data-table.c
index 64743f7..222536c 100644
--- a/src/dialogs/dialog-data-table.c
+++ b/src/dialogs/dialog-data-table.c
@@ -82,7 +82,7 @@ cb_data_table_response (GtkWidget *dialog, gint response_id, GnmDialogDataTable
if (response_id == GTK_RESPONSE_HELP)
return;
if (response_id == GTK_RESPONSE_OK)
- cmd_create_data_table (WORKBOOK_CONTROL (state->wbcg),
+ cmd_create_data_table (GNM_WBC (state->wbcg),
state->sheet, &state->input_range,
gnm_expr_entry_get_text (state->col_entry),
gnm_expr_entry_get_text (state->row_entry));
@@ -140,7 +140,7 @@ dialog_data_table (WBCGtk *wbcg)
gnumeric_dialog_raise_if_exists (wbcg, DIALOG_DATA_TABLE_KEY))
return;
- sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
r = selection_first_range (sv, GO_CMD_CONTEXT (wbcg), _("Create Data Table"));
if (NULL == r)
return;
@@ -159,7 +159,7 @@ dialog_data_table (WBCGtk *wbcg)
GO_CMD_CONTEXT (wbcg), _("Data Table")))
return;
if (cmd_cell_range_is_locked_effective
- (sheet, &input_range, WORKBOOK_CONTROL (wbcg),
+ (sheet, &input_range, GNM_WBC (wbcg),
_("Data Table")))
return;
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index d6b83e6..ad03bfe 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -543,7 +543,7 @@ name_guru_init_button (NameGuruState *state, char const *name)
static void
cb_name_guru_destroy (NameGuruState *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
wb_view_selection_desc (wb_control_view (wbc), TRUE, wbc);
g_clear_object (&state->gui);
@@ -625,7 +625,7 @@ name_guru_delete (NameGuruState *state, GtkTreeIter *iter, item_type_t type)
if (!name_guru_warn (state, nexpr))
return;
- cmd_remove_name (WORKBOOK_CONTROL (state->wbcg), nexpr);
+ cmd_remove_name (GNM_WBC (state->wbcg), nexpr);
}
gtk_tree_store_remove (state->model, iter);
}
@@ -768,7 +768,7 @@ cb_name_guru_switch_scope (G_GNUC_UNUSED GtkCellRendererToggle *cell,
switch (type) {
case item_type_available_wb_name:
if (cmd_rescope_name
- (WORKBOOK_CONTROL (state->wbcg),
+ (GNM_WBC (state->wbcg),
nexpr, state->sheet))
return;
new_path = "1";
@@ -780,7 +780,7 @@ cb_name_guru_switch_scope (G_GNUC_UNUSED GtkCellRendererToggle *cell,
break;
case item_type_available_sheet_name:
if (cmd_rescope_name
- (WORKBOOK_CONTROL (state->wbcg),
+ (GNM_WBC (state->wbcg),
nexpr, NULL))
return;
new_path = "0";
@@ -920,7 +920,7 @@ cb_name_guru_content_edited
if (type != item_type_new_unsaved_wb_name
&& type != item_type_new_unsaved_sheet_name) {
/* save the changes (if the name is already saved) */
- cmd_define_name (WORKBOOK_CONTROL (state->wbcg),
+ cmd_define_name (GNM_WBC (state->wbcg),
expr_name_name (nexpr),
&pp, texpr, NULL);
} else
@@ -979,7 +979,7 @@ cb_name_guru_name_edited (G_GNUC_UNUSED GtkCellRendererText *cell,
if (texpr == NULL)
return;
- if (!cmd_define_name (WORKBOOK_CONTROL (state->wbcg),
+ if (!cmd_define_name (GNM_WBC (state->wbcg),
new_text, &pp,
texpr, NULL)) {
nexpr = expr_name_lookup (&pp, new_text);
@@ -1048,7 +1048,7 @@ cb_name_guru_selection_function (G_GNUC_UNUSED GtkTreeSelection *selection,
static gboolean
name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
{
- Workbook *wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ Workbook *wb = wb_control_get_workbook (GNM_WBC (wbcg));
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
@@ -1064,7 +1064,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
state->wbcg = wbcg;
state->wb = wb;
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->sheet = sv_sheet (state->sv);
parse_pos_init_editpos (&state->pp, state->sv);
diff --git a/src/dialogs/dialog-delete-cells.c b/src/dialogs/dialog-delete-cells.c
index 8245d7d..e95bd72 100644
--- a/src/dialogs/dialog-delete-cells.c
+++ b/src/dialogs/dialog-delete-cells.c
@@ -61,7 +61,7 @@ cb_delete_cell_destroy (DeleteCellState *state)
static void
cb_delete_cell_ok_clicked (DeleteCellState *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
GtkWidget *radio_0;
int cols, rows;
int i;
@@ -111,7 +111,7 @@ void
dialog_delete_cells (WBCGtk *wbcg)
{
DeleteCellState *state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
Sheet *sheet = sv_sheet (sv);
GnmRange const *sel;
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index d542f24..c1801f4 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -903,7 +903,7 @@ dialog_doc_metadata_set_gsf_prop (DialogDocMetaData *state,
((existing_value == NULL) && (existing_link == NULL)))
return G_TYPE_INVALID;
else {
- cmd_change_meta_data (WORKBOOK_CONTROL (state->wbcg), NULL,
+ cmd_change_meta_data (GNM_WBC (state->wbcg), NULL,
g_slist_prepend (NULL, g_strdup (name)));
return G_TYPE_INVALID;
}
@@ -962,7 +962,7 @@ dialog_doc_metadata_set_gsf_prop (DialogDocMetaData *state,
if (link != NULL)
gsf_doc_prop_set_link (doc_prop, g_strdup (link));
- cmd_change_meta_data (WORKBOOK_CONTROL (state->wbcg),
+ cmd_change_meta_data (GNM_WBC (state->wbcg),
g_slist_prepend (NULL, doc_prop), NULL);
return val_type;
@@ -1554,7 +1554,7 @@ cb_dialog_doc_metadata_remove_clicked (GtkWidget *remove_bt,
NULL, NULL);
/* Remove property from GsfMetadata */
- cmd_change_meta_data (WORKBOOK_CONTROL (state->wbcg), NULL,
+ cmd_change_meta_data (GNM_WBC (state->wbcg), NULL,
g_slist_prepend (NULL, g_value_dup_string (prop_name)));
/* Remove from Tree View */
@@ -2109,7 +2109,7 @@ dialog_doc_metadata_set_file_permissions (DialogDocMetaData *state)
static void
dialog_doc_metadata_free (DialogDocMetaData *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
wb_view_selection_desc (wb_control_view (wbc), TRUE, wbc);
@@ -2312,9 +2312,9 @@ dialog_doc_metadata_init (DialogDocMetaData *state,
int i;
state->wbcg = wbcg;
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL(wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC(wbcg));
state->doc = GO_DOC (state->wb);
- state->metadata = go_doc_get_meta_data (wb_control_get_doc (WORKBOOK_CONTROL (state->wbcg)));
+ state->metadata = go_doc_get_meta_data (wb_control_get_doc (GNM_WBC (state->wbcg)));
g_return_val_if_fail (state->metadata != NULL, TRUE);
diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c
index 46fb566..35ecd5b 100644
--- a/src/dialogs/dialog-fill-series.c
+++ b/src/dialogs/dialog-fill-series.c
@@ -117,7 +117,7 @@ cb_fill_series_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
entry_to_float (GTK_ENTRY (state->start_entry),
&fs->start_value, TRUE);
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, fs, fill_series_engine, TRUE))
gtk_widget_destroy (state->base.dialog);
@@ -236,7 +236,7 @@ void
dialog_fill_series (WBCGtk *wbcg)
{
FillSeriesState *state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
g_return_if_fail (wbcg != NULL);
diff --git a/src/dialogs/dialog-formula-guru.c b/src/dialogs/dialog-formula-guru.c
index 05586d7..fb1205f 100644
--- a/src/dialogs/dialog-formula-guru.c
+++ b/src/dialogs/dialog-formula-guru.c
@@ -1040,14 +1040,14 @@ dialog_formula_guru (WBCGtk *wbcg, GnmFunc *fd)
state = g_new (FormulaGuruState, 1);
state->wbcg = wbcg;
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
state->gui = gui;
state->active_path = NULL;
state->pos = g_new (GnmParsePos, 1);
gnm_expr_entry_disable_tips (wbcg_get_entry_logical (wbcg));
- sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
cell = sheet_cell_get (sv_sheet (sv), sv->edit_pos.col, sv->edit_pos.row);
if (cell != NULL) {
parse_pos_init_cell (state->pos, cell);
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index b863665..cc206ab 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -1381,7 +1381,7 @@ dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
state = g_new (FunctionSelectState, 1);
state->wbcg = wbcg;
- state->sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (wbcg));
+ state->sheet = wb_control_cur_sheet (GNM_WBC (wbcg));
state->localized_function_names = state->sheet->convs->localized_function_names;
state->wb = state->sheet->workbook;
state->gui = gui;
diff --git a/src/dialogs/dialog-goal-seek.c b/src/dialogs/dialog-goal-seek.c
index 070f5e4..4063c26 100644
--- a/src/dialogs/dialog-goal-seek.c
+++ b/src/dialogs/dialog-goal-seek.c
@@ -266,7 +266,7 @@ cb_dialog_destroy (GoalSeekState *state)
if (!state->cancelled
&& state->old_value != NULL
&& state->old_cell != NULL) {
- cmd_goal_seek (WORKBOOK_CONTROL(state->wbcg),
+ cmd_goal_seek (GNM_WBC(state->wbcg),
state->old_cell, state->old_value, NULL);
state->old_value = NULL;
}
@@ -489,7 +489,7 @@ dialog_preload_selection (GoalSeekState *state, GnmExprEntry *entry)
sel = selection_first_range
(wb_control_cur_sheet_view
- (WORKBOOK_CONTROL (state->wbcg)), NULL, NULL);
+ (GNM_WBC (state->wbcg)), NULL, NULL);
if (sel)
gnm_expr_entry_load_from_range (entry,
state->sheet, sel);
@@ -692,7 +692,7 @@ dialog_goal_seek (WBCGtk *wbcg, Sheet *sheet)
state = g_new (GoalSeekState, 1);
state->wbcg = wbcg;
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
state->sheet = sheet;
state->gui = gui;
state->warning_dialog = NULL;
diff --git a/src/dialogs/dialog-goto-cell.c b/src/dialogs/dialog-goto-cell.c
index d16723a..be4918a 100644
--- a/src/dialogs/dialog-goto-cell.c
+++ b/src/dialogs/dialog-goto-cell.c
@@ -108,7 +108,7 @@ static GnmValue *
dialog_goto_get_val (GotoState *state)
{
char const *text = gtk_entry_get_text (state->goto_text);
- Sheet *sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (state->wbcg));
+ Sheet *sheet = wb_control_cur_sheet (GNM_WBC (state->wbcg));
GnmValue *val = value_new_cellrange_str (sheet, text);
if (val == NULL) {
@@ -131,7 +131,7 @@ cb_dialog_goto_go_clicked (G_GNUC_UNUSED GtkWidget *button,
gint cols = gtk_spin_button_get_value_as_int (state->spin_cols);
gint rows = gtk_spin_button_get_value_as_int (state->spin_rows);
GnmValue *val = dialog_goto_get_val (state);
- Sheet *sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (state->wbcg));
+ Sheet *sheet = wb_control_cur_sheet (GNM_WBC (state->wbcg));
if (val == NULL)
return;
@@ -143,7 +143,7 @@ cb_dialog_goto_go_clicked (G_GNUC_UNUSED GtkWidget *button,
gnm_cellref_make_abs (&range.b, &val->v_range.cell.b, &ep);
value_release (val);
- wb_control_jump (WORKBOOK_CONTROL (state->wbcg), sheet, &range);
+ wb_control_jump (GNM_WBC (state->wbcg), sheet, &range);
return;
}
@@ -158,7 +158,7 @@ cb_dialog_goto_update_sensitivity (G_GNUC_UNUSED GtkWidget *dummy,
GnmSheetSize const *ssz;
if (sheet == NULL)
- sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (state->wbcg));
+ sheet = wb_control_cur_sheet (GNM_WBC (state->wbcg));
ssz = gnm_sheet_get_size (sheet);
cols = ssz->max_cols;
@@ -266,11 +266,11 @@ cb_dialog_goto_selection_changed (GtkTreeSelection *the_selection, GotoState *st
char *where_to;
if (NULL == sheet)
- sheet = wb_control_cur_sheet ( WORKBOOK_CONTROL (state->wbcg));
+ sheet = wb_control_cur_sheet ( GNM_WBC (state->wbcg));
parse_pos_init_sheet (&pp, sheet);
where_to = expr_name_as_string (name, &pp, gnm_conventions_default);
- if (wb_control_parse_and_jump (WORKBOOK_CONTROL (state->wbcg), where_to))
+ if (wb_control_parse_and_jump (GNM_WBC (state->wbcg), where_to))
gtk_entry_set_text (state->goto_text,
where_to);
g_free (where_to);
@@ -278,7 +278,7 @@ cb_dialog_goto_selection_changed (GtkTreeSelection *the_selection, GotoState *st
}
if (sheet)
wb_view_sheet_focus (
- wb_control_view (WORKBOOK_CONTROL (state->wbcg)), sheet);
+ wb_control_view (GNM_WBC (state->wbcg)), sheet);
}
}
@@ -307,7 +307,7 @@ static void
dialog_goto_load_selection (GotoState *state)
{
SheetView *sv = wb_control_cur_sheet_view
- (WORKBOOK_CONTROL (state->wbcg));
+ (GNM_WBC (state->wbcg));
GnmRange const *first = selection_first_range (sv, NULL, NULL);
if (first != NULL) {
@@ -449,7 +449,7 @@ dialog_goto_cell (WBCGtk *wbcg)
state = g_new (GotoState, 1);
state->wbcg = wbcg;
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
state->gui = gui;
state->dialog = go_gtk_builder_get_widget (state->gui, "goto_dialog");
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index 47dd58b..c5213b2 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -383,7 +383,7 @@ dhl_cb_ok (G_GNUC_UNUSED GtkWidget *button, HyperlinkState *state)
if (!success)
return; /* Let user continue editing */
- wb_control_sheet_focus (WORKBOOK_CONTROL (state->wbcg), state->sheet);
+ wb_control_sheet_focus (GNM_WBC (state->wbcg), state->sheet);
if (target) {
gnm_hlink_set_target (state->link, target);
@@ -397,12 +397,12 @@ dhl_cb_ok (G_GNUC_UNUSED GtkWidget *button, HyperlinkState *state)
if (state->is_new) {
cmdname = _("Add Hyperlink");
- cmd_selection_hyperlink (WORKBOOK_CONTROL (state->wbcg),
+ cmd_selection_hyperlink (GNM_WBC (state->wbcg),
style,
cmdname, target);
} else {
cmdname = _("Edit Hyperlink");
- cmd_selection_hyperlink (WORKBOOK_CONTROL (state->wbcg),
+ cmd_selection_hyperlink (GNM_WBC (state->wbcg),
style,
cmdname, NULL);
g_free (target);
@@ -411,7 +411,7 @@ dhl_cb_ok (G_GNUC_UNUSED GtkWidget *button, HyperlinkState *state)
style = gnm_style_new ();
gnm_style_set_hlink (style, NULL);
cmdname = _("Remove Hyperlink");
- cmd_selection_hyperlink (WORKBOOK_CONTROL (state->wbcg), style,
+ cmd_selection_hyperlink (GNM_WBC (state->wbcg), style,
cmdname, NULL);
}
gtk_widget_destroy (state->dialog);
@@ -589,7 +589,7 @@ dialog_hyperlink (WBCGtk *wbcg, SheetControl *sc)
state = g_new (HyperlinkState, 1);
state->wbcg = wbcg;
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
state->sc = sc;
state->gui = gui;
state->dialog = go_gtk_builder_get_widget (state->gui, "hyperlink-dialog");
diff --git a/src/dialogs/dialog-insert-cells.c b/src/dialogs/dialog-insert-cells.c
index 9f57546..72b8a7d 100644
--- a/src/dialogs/dialog-insert-cells.c
+++ b/src/dialogs/dialog-insert-cells.c
@@ -62,7 +62,7 @@ static void
cb_insert_cell_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
InsertCellState *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
GtkWidget *radio_0;
int cols, rows;
int i;
@@ -114,7 +114,7 @@ dialog_insert_cells (WBCGtk *wbcg)
{
GtkBuilder *gui;
InsertCellState *state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
Sheet *sheet = sv_sheet (sv);
GnmRange const *sel;
diff --git a/src/dialogs/dialog-merge.c b/src/dialogs/dialog-merge.c
index 27ef59b..89767c3 100644
--- a/src/dialogs/dialog-merge.c
+++ b/src/dialogs/dialog-merge.c
@@ -292,7 +292,7 @@ cb_merge_merge_clicked (G_GNUC_UNUSED GtkWidget *ignore,
}
- if (!cmd_merge_data (WORKBOOK_CONTROL (state->wbcg), state->sheet,
+ if (!cmd_merge_data (GNM_WBC (state->wbcg), state->sheet,
v_zone, field_list, data_list))
gtk_widget_destroy (state->dialog);
}
@@ -329,7 +329,7 @@ dialog_merge (WBCGtk *wbcg)
state = g_new0 (MergeState, 1);
state->gui = gui;
state->wbcg = wbcg;
- state->sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (state->wbcg));
+ state->sheet = wb_control_cur_sheet (GNM_WBC (state->wbcg));
state->dialog = go_gtk_builder_get_widget (gui, "Merge");
state->warning_dialog = NULL;
@@ -354,7 +354,7 @@ dialog_merge (WBCGtk *wbcg)
gtk_widget_set_hexpand (GTK_WIDGET (state->zone), TRUE);
gtk_grid_attach (grid, GTK_WIDGET (state->zone), 1, 0, 2, 1);
r = selection_first_range (
- wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg)), NULL, NULL);
+ wb_control_cur_sheet_view (GNM_WBC (wbcg)), NULL, NULL);
if (r != NULL)
gnm_expr_entry_load_from_range (state->zone,
state->sheet, r);
diff --git a/src/dialogs/dialog-paste-special.c b/src/dialogs/dialog-paste-special.c
index 0576796..d6648e0 100644
--- a/src/dialogs/dialog-paste-special.c
+++ b/src/dialogs/dialog-paste-special.c
@@ -217,7 +217,7 @@ cb_tool_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
(GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->gui,"dont-change-formulae"))))
result |= PASTE_EXPR_LOCAL_RELOCATE;
- cmd_paste_to_selection (WORKBOOK_CONTROL (state->wbcg), state->sv, result);
+ cmd_paste_to_selection (GNM_WBC (state->wbcg), state->sv, result);
gtk_widget_destroy (state->dialog);
return;
}
@@ -226,7 +226,7 @@ static void
cb_tool_paste_link_clicked (G_GNUC_UNUSED GtkWidget *button,
PasteSpecialState *state)
{
- cmd_paste_to_selection (WORKBOOK_CONTROL (state->wbcg), state->sv, PASTE_LINK);
+ cmd_paste_to_selection (GNM_WBC (state->wbcg), state->sv, PASTE_LINK);
gtk_widget_destroy (state->dialog);
return;
}
@@ -249,7 +249,7 @@ dialog_paste_special (WBCGtk *wbcg)
state->gui = gui;
state->dialog = go_gtk_builder_get_widget (state->gui, "paste-special");
state->sheet = wbcg_cur_sheet (wbcg);
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
g_return_if_fail (state->dialog != NULL);
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index 7b80d74..eff9d7f 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -648,7 +648,7 @@ dialog_plugin_manager (WBCGtk *wbcg)
GtkCellRenderer *rend;
g_return_if_fail (wbcg != NULL);
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
if (gnumeric_dialog_raise_if_exists (wbcg, PLUGIN_MANAGER_DIALOG_KEY))
return;
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index 1a2dd49..dc5ca54 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -2155,11 +2155,11 @@ load_print_area (PrinterSetupState *state)
print_area = sheet_get_nominal_printarea
(wb_control_cur_sheet
- (WORKBOOK_CONTROL (state->wbcg)));
+ (GNM_WBC (state->wbcg)));
if (print_area != NULL)
gnm_expr_entry_load_from_range
(state->area_entry,
- wb_control_cur_sheet (WORKBOOK_CONTROL (state->wbcg)),
+ wb_control_cur_sheet (GNM_WBC (state->wbcg)),
print_area);
else
gnm_expr_entry_load_from_text
@@ -2662,7 +2662,7 @@ cb_do_print_preview (PrinterSetupState *state)
gog_graph_set_size (graph, w, h);
}
}
- gnm_print_sheet (WORKBOOK_CONTROL (state->wbcg),
+ gnm_print_sheet (GNM_WBC (state->wbcg),
state->sheet, TRUE, GNM_PRINT_ACTIVE_SHEET, NULL);
if (graph)
gog_graph_set_size (graph, width, height);
@@ -2685,7 +2685,7 @@ cb_do_print_ok (PrinterSetupState *state)
"is_default_check")))) {
print_info_save (state->pi);
}
- cmd_print_setup (WORKBOOK_CONTROL (state->wbcg),
+ cmd_print_setup (GNM_WBC (state->wbcg),
print_setup_get_sheet (state), state->pi);
gtk_widget_destroy (state->dialog);
}
@@ -2694,7 +2694,7 @@ static void
cb_do_print (PrinterSetupState *state)
{
Sheet *sheet = state->sheet;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
cb_do_print_ok (state);
gnm_print_sheet (wbc, sheet, FALSE, GNM_PRINT_SAVED_INFO, NULL);
diff --git a/src/dialogs/dialog-quit.c b/src/dialogs/dialog-quit.c
index 6f8f47e..ec0cdd8 100644
--- a/src/dialogs/dialog-quit.c
+++ b/src/dialogs/dialog-quit.c
@@ -381,7 +381,7 @@ show_quit_dialog (GList *dirty, WBCGtk *wbcg)
Workbook *wb = WORKBOOK (doc);
WBCGtk *wbcg2 = wbcg_find_for_workbook (wb, wbcg, NULL, NULL);
- ok = wbcg2 && gui_file_save (wbcg2, wb_control_view (WORKBOOK_CONTROL
(wbcg2)));
+ ok = wbcg2 && gui_file_save (wbcg2, wb_control_view (GNM_WBC (wbcg2)));
if (!ok)
quit = FALSE;
}
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index 771a0af..f188f33 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -162,7 +162,7 @@ random_cor_tool_ok_clicked_cb (GtkWidget *button, RandomCorToolState *state)
(state->base.gui, matrix_group);
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, tool_random_cor_engine, TRUE) &&
(button == state->base.ok_button))
diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c
index c36c365..cf29de3 100644
--- a/src/dialogs/dialog-random-generator.c
+++ b/src/dialogs/dialog-random-generator.c
@@ -536,7 +536,7 @@ random_tool_ok_clicked_cb (GtkWidget *button, RandomToolState *state)
data = g_new0 (tools_data_random_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
- data->wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ data->wbc = GNM_WBC (state->base.wbcg);
err = entry_to_int (GTK_ENTRY (state->vars_entry), &data->n_vars, FALSE);
err = entry_to_int (GTK_ENTRY (state->count_entry), &data->count, FALSE);
@@ -695,7 +695,7 @@ random_tool_ok_clicked_cb (GtkWidget *button, RandomToolState *state)
break;
}
- if (!cmd_analysis_tool (WORKBOOK_CONTROL (state->base.wbcg),
+ if (!cmd_analysis_tool (GNM_WBC (state->base.wbcg),
state->base.sheet,
dao, data, tool_random_engine, TRUE) &&
(button == state->base.ok_button))
diff --git a/src/dialogs/dialog-row-height.c b/src/dialogs/dialog-row-height.c
index 6438ac7..13e0be1 100644
--- a/src/dialogs/dialog-row-height.c
+++ b/src/dialogs/dialog-row-height.c
@@ -196,14 +196,14 @@ cb_dialog_row_height_apply_clicked (G_GNUC_UNUSED GtkWidget *button,
if (state->set_default_value) {
double points = value * 72./gnm_app_display_dpi_get (TRUE);
- cmd_colrow_std_size (WORKBOOK_CONTROL (state->wbcg),
+ cmd_colrow_std_size (GNM_WBC (state->wbcg),
state->sheet, FALSE, points);
dialog_row_height_load_value (state);
} else {
if (use_default)
size_pixels = 0;
- workbook_cmd_resize_selected_colrow (WORKBOOK_CONTROL (state->wbcg),
+ workbook_cmd_resize_selected_colrow (GNM_WBC (state->wbcg),
state->sheet, FALSE, size_pixels);
dialog_row_height_load_value (state);
}
@@ -252,7 +252,7 @@ dialog_row_height (WBCGtk *wbcg, gboolean use_default)
state = g_new (RowHeightState, 1);
state->wbcg = wbcg;
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->sheet = sv_sheet (state->sv);
state->adjusting = FALSE;
state->gui = gnm_gtk_builder_load ("row-height.ui", NULL, GO_CMD_CONTEXT (wbcg));
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index 94d800d..d9d2686 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -340,7 +340,7 @@ scenario_add_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
dao_init_new_sheet (&dao);
dao.sheet = state->base.sheet;
- wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ wbc = GNM_WBC (state->base.wbcg);
sc = gnm_sheet_scenario_new (state->base.sheet, name);
if (comment && comment[0])
@@ -383,7 +383,7 @@ dialog_scenario_add (WBCGtk *wbcg)
if (wbcg == NULL)
return;
- wbc = WORKBOOK_CONTROL (wbcg);
+ wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, "ScenarioAdd"))
@@ -563,7 +563,7 @@ scenarios_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
ScenariosState *state)
{
if (state->current) {
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->base.wbcg);
cmd_scenario_mngr (wbc, state->current, state->undo);
}
@@ -606,7 +606,7 @@ scenarios_cancel_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
restore_old_values (state);
- wbc = WORKBOOK_CONTROL (state->base.wbcg);
+ wbc = GNM_WBC (state->base.wbcg);
/* Remove report sheets created on this dialog session. */
for (cur = state->new_report_sheets; cur != NULL;
@@ -718,7 +718,7 @@ scenarios_summary_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
return;
}
- scenario_summary (WORKBOOK_CONTROL (state->base.wbcg), state->base.sheet,
+ scenario_summary (GNM_WBC (state->base.wbcg), state->base.sheet,
results, &new_sheet);
state->new_report_sheets =
@@ -783,7 +783,7 @@ dialog_scenarios (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
- wbc = WORKBOOK_CONTROL (wbcg);
+ wbc = GNM_WBC (wbcg);
sheet = wb_control_cur_sheet (wbc);
state = g_new (ScenariosState, 1);
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index c580ba7..6e15118 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -139,7 +139,7 @@ apply_clicked (G_GNUC_UNUSED GtkWidget *widget, DialogState *dd)
replace_text = gnm_search_normalize (gtk_entry_get_text (dd->replace_text));
sr = g_object_new (GNM_SEARCH_REPLACE_TYPE,
- "sheet", wb_control_cur_sheet (WORKBOOK_CONTROL (wbcg)),
+ "sheet", wb_control_cur_sheet (GNM_WBC (wbcg)),
"scope", scope,
"range-text", gnm_expr_entry_get_text (dd->rangetext),
"search-text", search_text,
@@ -278,7 +278,7 @@ dialog_search_replace (WBCGtk *wbcg,
gtk_widget_set_hexpand (GTK_WIDGET (dd->rangetext), TRUE);
gtk_grid_attach (grid, GTK_WIDGET (dd->rangetext), 1, 9, 2, 1);
selection_text = selection_to_string (
- wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg)),
+ wb_control_cur_sheet_view (GNM_WBC (wbcg)),
TRUE);
gnm_expr_entry_load_from_text (dd->rangetext, selection_text);
g_free (selection_text);
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index bdb3172..0fc6652 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -286,7 +286,7 @@ cursor_change (GtkTreeView *tree_view, DialogState *dd)
GnmSearchFilterResult *item = g_ptr_array_index (dd->matches, matchno);
int col = item->ep.eval.col;
int row = item->ep.eval.row;
- WorkbookControl *wbc = WORKBOOK_CONTROL (dd->wbcg);
+ WorkbookControl *wbc = GNM_WBC (dd->wbcg);
WorkbookView *wbv = wb_control_view (wbc);
SheetView *sv;
@@ -309,7 +309,7 @@ search_clicked (G_GNUC_UNUSED GtkWidget *widget, DialogState *dd)
{
GtkBuilder *gui = dd->gui;
WBCGtk *wbcg = dd->wbcg;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GnmSearchReplace *sr;
char *err;
int i;
@@ -525,7 +525,7 @@ dialog_search (WBCGtk *wbcg)
{
char *selection_text =
selection_to_string (
- wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg)),
+ wb_control_cur_sheet_view (GNM_WBC (wbcg)),
TRUE);
gnm_expr_entry_load_from_text (dd->rangetext, selection_text);
g_free (selection_text);
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index a60ea6c..ad1982c 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -128,7 +128,7 @@ update_undo (SheetManager *state, WorkbookControl *wbc)
static void
workbook_signals_block (SheetManager *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
g_signal_handler_block (G_OBJECT (wb),
@@ -142,7 +142,7 @@ workbook_signals_block (SheetManager *state)
static void
workbook_signals_unblock (SheetManager *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
g_signal_handler_unblock (G_OBJECT (wb),
@@ -229,7 +229,7 @@ static void
sort_asc_desc (SheetManager *state, gboolean asc)
{
WorkbookSheetState *old_state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
GSList *l = NULL, *l_tmp;
gint n = 0;
@@ -302,7 +302,7 @@ cb_color_changed_fore (G_GNUC_UNUSED GOComboColor *go_combo_color,
GList *selected_rows, *l;
GtkTreeSelection *selection = gtk_tree_view_get_selection (state->sheet_list);
WorkbookSheetState *old_state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
GdkRGBA gdk_color;
GdkRGBA *p_gdk_color;
@@ -354,7 +354,7 @@ cb_color_changed_back (G_GNUC_UNUSED GOComboColor *go_combo_color,
GList *selected_rows, *l;
GtkTreeSelection *selection = gtk_tree_view_get_selection (state->sheet_list);
WorkbookSheetState *old_state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
GdkRGBA gdk_color;
GdkRGBA *p_gdk_color;
@@ -494,7 +494,7 @@ cb_selection_changed (G_GNUC_UNUSED GtkTreeSelection *ignored,
if (sheet != NULL)
wb_view_sheet_focus (
- wb_control_view (WORKBOOK_CONTROL (state->wbcg)), sheet);
+ wb_control_view (GNM_WBC (state->wbcg)), sheet);
g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
}
@@ -511,7 +511,7 @@ cb_toggled_lock (G_GNUC_UNUSED GtkCellRendererToggle *cell,
gboolean is_locked = TRUE;
Sheet *this_sheet = NULL;
WorkbookSheetState *old_state = NULL;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
if (gtk_tree_model_get_iter (model, &iter, path)) {
@@ -557,7 +557,7 @@ cb_toggled_direction (G_GNUC_UNUSED GtkCellRendererToggle *cell,
gboolean is_rtl = TRUE;
Sheet *this_sheet = NULL;
WorkbookSheetState *old_state = NULL;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
if (gtk_tree_model_get_iter (model, &iter, path)) {
@@ -601,7 +601,7 @@ cb_toggled_visible (G_GNUC_UNUSED GtkCellRendererToggle *cell,
gboolean is_visible;
Sheet *this_sheet;
WorkbookSheetState *old_state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
int cnt;
@@ -839,7 +839,7 @@ populate_sheet_list (SheetManager *state)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
Sheet *cur_sheet = wb_control_cur_sheet (wbc);
int i, n = workbook_sheet_count (wb);
@@ -921,7 +921,7 @@ cb_add_clicked (G_GNUC_UNUSED GtkWidget *ignore, SheetManager *state)
GList *selected_rows;
int index = -1;
WorkbookSheetState *old_state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
Sheet *sheet, *old_sheet = NULL;
@@ -963,7 +963,7 @@ static void
cb_append_clicked (G_GNUC_UNUSED GtkWidget *ignore, SheetManager *state)
{
WorkbookSheetState *old_state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
GtkTreeIter iter;
Sheet *sheet, *old_sheet;
@@ -1000,7 +1000,7 @@ cb_duplicate_clicked (G_GNUC_UNUSED GtkWidget *ignore,
GList *selected_rows;
WorkbookSheetState *old_state;
int index;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
Sheet *new_sheet, *this_sheet;
@@ -1045,7 +1045,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkWidget *ignore,
GtkTreeSelection *selection = gtk_tree_view_get_selection (state->sheet_list);
GList *selected_rows, *l;
WorkbookSheetState *old_state;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
g_return_if_fail (selection != NULL);
@@ -1139,7 +1139,7 @@ verify_validity (SheetManager *state, gboolean *pchanged)
static void
cb_apply_names_clicked (G_GNUC_UNUSED GtkWidget *ignore, SheetManager *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
WorkbookSheetState *old_state;
GtkTreeIter this_iter;
@@ -1183,7 +1183,7 @@ cb_apply_names_clicked (G_GNUC_UNUSED GtkWidget *ignore, SheetManager *state)
static void
cb_sheet_order_destroy (SheetManager *state)
{
- Workbook *wb = wb_control_get_workbook (WORKBOOK_CONTROL (state->wbcg));
+ Workbook *wb = wb_control_get_workbook (GNM_WBC (state->wbcg));
/* Stop to listen to changes in the sheet order. */
if (state->sheet_order_changed_listener)
@@ -1226,7 +1226,7 @@ static void
dialog_sheet_order_update_sheet_order (SheetManager *state)
{
GtkTreeIter iter;
- Workbook *wb = wb_control_get_workbook (WORKBOOK_CONTROL (state->wbcg));
+ Workbook *wb = wb_control_get_workbook (GNM_WBC (state->wbcg));
int i, n_sheets, n_children;
GtkTreeModel *model = GTK_TREE_MODEL (state->model);
GtkTreeSelection *sel = gtk_tree_view_get_selection (state->sheet_list);
@@ -1336,7 +1336,7 @@ cb_sheet_added (Workbook *wb, SheetManager *state)
static void
dialog_sheet_order_changed (SheetManager *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
WorkbookSheetState *old_state;
GtkTreeIter this_iter;
@@ -1399,7 +1399,7 @@ cb_dialog_order_changed_by_insertion (G_GNUC_UNUSED GtkListStore *model,
static void
cb_undo_clicked (G_GNUC_UNUSED GtkWidget *ignore, SheetManager *state)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
command_undo (wbc);
@@ -1445,7 +1445,7 @@ dialog_sheet_order (WBCGtk *wbcg)
if (gui == NULL)
return;
- wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ wb = wb_control_get_workbook (GNM_WBC (wbcg));
if (g_object_get_data (G_OBJECT (wb), SHEET_ORDER_KEY)) {
GtkWidget *dialog = gtk_message_dialog_new
(wbcg_toplevel (wbcg),
@@ -1494,7 +1494,7 @@ dialog_sheet_order (WBCGtk *wbcg)
grid = GTK_GRID (go_gtk_builder_get_widget (gui,"main-grid"));
cg = go_color_group_fetch ("back_color_group",
- wb_control_view (WORKBOOK_CONTROL (wbcg)));
+ wb_control_view (GNM_WBC (wbcg)));
icon = go_gtk_widget_render_icon_pixbuf (widget, "gnumeric-bucket", GTK_ICON_SIZE_LARGE_TOOLBAR);
state->ccombo_back = go_combo_color_new (icon, _("Default"), 0, cg);
g_object_unref (icon);
@@ -1505,7 +1505,7 @@ dialog_sheet_order (WBCGtk *wbcg)
gtk_widget_set_sensitive (state->ccombo_back, FALSE);
cg = go_color_group_fetch ("fore_color_group",
- wb_control_view (WORKBOOK_CONTROL (wbcg)));
+ wb_control_view (GNM_WBC (wbcg)));
icon = go_gtk_widget_render_icon_pixbuf (widget, "font", GTK_ICON_SIZE_LARGE_TOOLBAR);
state->ccombo_fore = go_combo_color_new (icon, _("Default"), 0, cg);
g_object_unref (icon);
diff --git a/src/dialogs/dialog-sheet-rename.c b/src/dialogs/dialog-sheet-rename.c
index 066fec1..0b262c3 100644
--- a/src/dialogs/dialog-sheet-rename.c
+++ b/src/dialogs/dialog-sheet-rename.c
@@ -61,7 +61,7 @@ cb_ok_clicked (RenameState *state)
{
const char *name = gtk_entry_get_text (GTK_ENTRY (state->new_name));
- cmd_rename_sheet (WORKBOOK_CONTROL (state->wbcg),
+ cmd_rename_sheet (GNM_WBC (state->wbcg),
state->sheet,
name);
diff --git a/src/dialogs/dialog-sheet-resize.c b/src/dialogs/dialog-sheet-resize.c
index 40876e5..fedd3dd 100644
--- a/src/dialogs/dialog-sheet-resize.c
+++ b/src/dialogs/dialog-sheet-resize.c
@@ -117,7 +117,7 @@ cb_ok_clicked (ResizeState *state)
all_sheets = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (state->all_sheets_button));
- wbc = WORKBOOK_CONTROL (state->wbcg);
+ wbc = GNM_WBC (state->wbcg);
if (all_sheets) {
wb = wb_control_get_workbook (wbc);
diff --git a/src/dialogs/dialog-sheetobject-size.c b/src/dialogs/dialog-sheetobject-size.c
index c1248a9..69910a6 100644
--- a/src/dialogs/dialog-sheetobject-size.c
+++ b/src/dialogs/dialog-sheetobject-size.c
@@ -219,7 +219,7 @@ cb_dialog_so_size_apply_clicked (G_GNUC_UNUSED GtkWidget *button,
char const *label = state->so_pos_needs_restore ?
_("Move Object") : _("Resize Object");
sheet_object_set_anchor (state->so, state->old_anchor);
- if (!cmd_objects_move (WORKBOOK_CONTROL (state->wbcg),
+ if (!cmd_objects_move (GNM_WBC (state->wbcg),
g_slist_prepend (NULL, state->so),
g_slist_prepend
(NULL, sheet_object_anchor_dup
@@ -257,7 +257,7 @@ cb_dialog_so_size_apply_clicked (G_GNUC_UNUSED GtkWidget *button,
if (cnt > 1)
undo_name = _("Set Object Properties");
state->so_name_changed = state->so_print_check_changed =
- cmd_generic (WORKBOOK_CONTROL (state->wbcg),
+ cmd_generic (GNM_WBC (state->wbcg),
undo_name, undo, redo);
}
dialog_so_size_button_sensitivity (state);
@@ -319,7 +319,7 @@ dialog_so_size (WBCGtk *wbcg, GObject *so)
state = g_new (SOSizeState, 1);
state->wbcg = wbcg;
- state->sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->sheet = sv_sheet (state->sv);
state->scg = wbcg_get_nth_scg (wbcg, state->sheet->index_in_wb);
state->gui = gui;
diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c
index 0a6e65e..ad903d4 100644
--- a/src/dialogs/dialog-shuffle.c
+++ b/src/dialogs/dialog-shuffle.c
@@ -110,10 +110,10 @@ shuffle_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, ShuffleState *state)
type = gnm_gui_group_value (state->gui, shuffle_by);
- ds = data_shuffling (WORKBOOK_CONTROL (state->wbcg), dao,
+ ds = data_shuffling (GNM_WBC (state->wbcg), dao,
state->sheet, input, type);
- wbc = WORKBOOK_CONTROL (state->wbcg);
+ wbc = GNM_WBC (state->wbcg);
cmd_data_shuffle (wbc, ds, state->sheet);
value_release (input);
@@ -139,7 +139,7 @@ dialog_shuffle (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
- wbc = WORKBOOK_CONTROL (wbcg);
+ wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, SHUFFLE_KEY))
diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c
index 6cc7ca9..7ac38b4 100644
--- a/src/dialogs/dialog-simulation.c
+++ b/src/dialogs/dialog-simulation.c
@@ -340,7 +340,7 @@ simulation_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
sim.max_time = gtk_spin_button_get_value (GTK_SPIN_BUTTON (w)) - 1;
g_get_current_time (&sim.start);
- err = simulation_tool (WORKBOOK_CONTROL (state->wbcg),
+ err = simulation_tool (GNM_WBC (state->wbcg),
&dao, &sim);
g_get_current_time (&sim.end);
@@ -410,7 +410,7 @@ dialog_simulation (WBCGtk *wbcg, G_GNUC_UNUSED Sheet *sheet)
g_return_if_fail (wbcg != NULL);
- wbc = WORKBOOK_CONTROL (wbcg);
+ wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, SIMULATION_KEY))
diff --git a/src/dialogs/dialog-so-list.c b/src/dialogs/dialog-so-list.c
index 26f57c1..cdd0f6f 100644
--- a/src/dialogs/dialog-so-list.c
+++ b/src/dialogs/dialog-so-list.c
@@ -89,7 +89,7 @@ cb_so_list_response (GtkWidget *dialog, gint response_id, GnmDialogSOList *state
&pp, NULL, FALSE, GNM_EXPR_PARSE_FORCE_ABSOLUTE_REFERENCES);
content = gnm_expr_entry_parse (state->content_entry,
&pp, NULL, FALSE, GNM_EXPR_PARSE_FORCE_ABSOLUTE_REFERENCES);
- cmd_so_set_links (WORKBOOK_CONTROL (state->wbcg), state->so, output, content,
+ cmd_so_set_links (GNM_WBC (state->wbcg), state->so, output, content,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(state->as_index_radio)));
}
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 9358aad..38db38b 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -89,7 +89,7 @@ cb_dialog_so_styled_response (GtkWidget *dialog,
if (response_id == GTK_RESPONSE_OK) {
GSList *new_props = go_object_properties_collect (state->so);
force_new_style (state->so);
- cmd_generic (WORKBOOK_CONTROL (state->wbcg),
+ cmd_generic (GNM_WBC (state->wbcg),
_("Format Object"),
make_undo (state->so, state->orig_props),
make_undo (state->so, new_props));
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index bacf0a2..8729ad4 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -444,7 +444,7 @@ check_for_changed_options (SolverState *state)
state->orig_params)) {
GOUndo *undo = set_params (sheet, state->orig_params);
GOUndo *redo = set_params (sheet, sheet->solver_parameters);
- cmd_generic (WORKBOOK_CONTROL (state->wbcg),
+ cmd_generic (GNM_WBC (state->wbcg),
_("Changing solver parameters"),
undo, redo);
@@ -763,7 +763,7 @@ run_solver (SolverState *state, GnmSolverParameters *param)
/* ---------------------------------------- */
ok = gnm_solver_start (sol,
- WORKBOOK_CONTROL (state->wbcg),
+ GNM_WBC (state->wbcg),
&err);
if (ok) {
dialog_res = go_gtk_dialog_run (dialog, top);
@@ -836,7 +836,7 @@ run_solver (SolverState *state, GnmSolverParameters *param)
redo = go_undo_combine (redo, redo_report);
}
- cmd_generic (WORKBOOK_CONTROL (state->wbcg),
+ cmd_generic (GNM_WBC (state->wbcg),
_("Running solver"),
undo, redo);
res = g_object_ref (sol->result);
@@ -865,7 +865,7 @@ solver_add_scenario (SolverState *state, GnmSolverResult *res, gchar const *name
GnmValue const *vinput;
GnmScenario *sc;
GnmSheetRange sr;
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
vinput = gnm_solver_param_get_input (param);
gnm_sheet_range_from_value (&sr, vinput);
@@ -1187,7 +1187,7 @@ dialog_init (SolverState *state)
cell_name (target_cell));
else {
SheetView *sv = wb_control_cur_sheet_view
- (WORKBOOK_CONTROL (state->wbcg));
+ (GNM_WBC (state->wbcg));
if (sv) {
GnmRange first = {sv->edit_pos, sv->edit_pos};
gnm_expr_entry_load_from_range (state->target_entry,
diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c
index 16b9ee6..68d03d7 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -710,7 +710,7 @@ stf_export_dialog (WBCGtk *wbcg, GnmStfExport *stfe, Workbook *wb)
TextExportState state;
g_return_val_if_fail (IS_WORKBOOK (wb), TRUE);
- g_return_val_if_fail (IS_GNM_STF_EXPORT (stfe), TRUE);
+ g_return_val_if_fail (GNM_IS_STF_EXPORT (stfe), TRUE);
state.gui = gnm_gtk_builder_load ("dialog-stf-export.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (state.gui == NULL)
diff --git a/src/dialogs/dialog-stf-format-page.c b/src/dialogs/dialog-stf-format-page.c
index 6a2c830..01b8bf1 100644
--- a/src/dialogs/dialog-stf-format-page.c
+++ b/src/dialogs/dialog-stf-format-page.c
@@ -778,7 +778,7 @@ stf_dialog_format_page_init (GtkBuilder *gui, StfDialogData *pagedata)
/* Set properties */
pagedata->format.renderdata =
stf_preview_new (pagedata->format.format_data_container,
- workbook_date_conv (wb_control_get_workbook (WORKBOOK_CONTROL
(pagedata->wbcg))));
+ workbook_date_conv (wb_control_get_workbook (GNM_WBC (pagedata->wbcg))));
pagedata->format.formats = g_ptr_array_new ();
pagedata->format.index = -1;
pagedata->format.manual_change = FALSE;
diff --git a/src/dialogs/dialog-tabulate.c b/src/dialogs/dialog-tabulate.c
index 2cc0582..83090a9 100644
--- a/src/dialogs/dialog-tabulate.c
+++ b/src/dialogs/dialog-tabulate.c
@@ -272,7 +272,7 @@ tabulate_ok_clicked (G_GNUC_UNUSED GtkWidget *widget, DialogState *dd)
data->steps = steps;
data->with_coordinates = with_coordinates;
- if (!cmd_tabulate (WORKBOOK_CONTROL (dd->wbcg), data)) {
+ if (!cmd_tabulate (GNM_WBC (dd->wbcg), data)) {
gtk_widget_destroy (GTK_WIDGET (dialog));
return;
}
diff --git a/src/dialogs/dialog-view.c b/src/dialogs/dialog-view.c
index d7825c1..2fa58a0 100644
--- a/src/dialogs/dialog-view.c
+++ b/src/dialogs/dialog-view.c
@@ -53,7 +53,7 @@ cb_view_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
ViewState *state)
{
WBCGtk *wbcg = state->wbcg;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookControl *new_wbc;
gboolean shared;
GdkScreen *screen;
@@ -102,7 +102,7 @@ cb_view_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
wb_control_get_workbook (wbc),
screen);
- if (IS_WBC_GTK (new_wbc)) {
+ if (GNM_IS_WBC_GTK (new_wbc)) {
/* What else would it be? */
WBCGtk *new_wbcg = WBC_GTK (new_wbc);
wbcg_copy_toolbar_visibility (new_wbcg, wbcg);
diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c
index eb63ea7..8fe3dc7 100644
--- a/src/dialogs/dialog-workbook-attr.c
+++ b/src/dialogs/dialog-workbook-attr.c
@@ -343,8 +343,8 @@ dialog_workbook_attr (WBCGtk *wbcg)
state = g_new (AttrState, 1);
state->gui = gui;
state->wbcg = wbcg;
- state->wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
- state->wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ state->wbv = wb_control_view (GNM_WBC (wbcg));
+ state->wb = wb_control_get_workbook (GNM_WBC (wbcg));
attr_dialog_impl (state);
diff --git a/src/dialogs/dialog-zoom.c b/src/dialogs/dialog-zoom.c
index 2596065..1b3466b 100644
--- a/src/dialogs/dialog-zoom.c
+++ b/src/dialogs/dialog-zoom.c
@@ -149,7 +149,7 @@ cb_zoom_ok_clicked (G_GNUC_UNUSED GtkWidget *button, ZoomState *state)
g_list_free (l);
if (sheets) {
- WorkbookControl *wbc = WORKBOOK_CONTROL (state->wbcg);
+ WorkbookControl *wbc = GNM_WBC (state->wbcg);
double new_zoom = gtk_spin_button_get_value (state->zoom) / 100;
sheets = g_slist_reverse (sheets);
cmd_zoom (wbc, sheets, new_zoom);
@@ -200,7 +200,7 @@ dialog_zoom (WBCGtk *wbcg, Sheet *sheet)
gtk_tree_view_column_set_sort_column_id (column, COL_SHEET_NAME);
gtk_tree_view_append_column (GTK_TREE_VIEW (state->sheet_list), column);
- sheets = workbook_sheets (wb_control_get_workbook (WORKBOOK_CONTROL (wbcg)));
+ sheets = workbook_sheets (wb_control_get_workbook (GNM_WBC (wbcg)));
cur_row = row = 0;
for (l = sheets; l; l = l->next) {
GtkTreeIter iter;
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 87db574..8b84811 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -363,9 +363,9 @@ 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, WORKBOOK_CONTROL (wbcg));
+ sv_selection_copy (sv, GNM_WBC (wbcg));
else if (state == GDK_SHIFT_MASK)
- cmd_paste_to_selection (WORKBOOK_CONTROL (wbcg), sv, PASTE_DEFAULT);
+ cmd_paste_to_selection (GNM_WBC (wbcg), sv, PASTE_DEFAULT);
break;
case GDK_KEY_BackSpace:
@@ -394,9 +394,9 @@ gnm_pane_key_mode_sheet (GnmPane *pane, GdkEventKey *kevent,
break;
if (state == GDK_SHIFT_MASK) {
scg_mode_edit (scg);
- sv_selection_cut (sv, WORKBOOK_CONTROL (wbcg));
+ sv_selection_cut (sv, GNM_WBC (wbcg));
} else
- cmd_selection_clear (WORKBOOK_CONTROL (wbcg), CLEAR_VALUES);
+ cmd_selection_clear (GNM_WBC (wbcg), CLEAR_VALUES);
break;
/*
@@ -1127,7 +1127,7 @@ cb_pane_drag_motion (GtkWidget *widget, GdkDragContext *context,
GtkWidget *source_widget = gtk_drag_get_source_widget (context);
SheetControlGUI *scg = GNM_PANE (widget)->simple.scg;
- if ((IS_GNM_PANE (source_widget) &&
+ if ((GNM_IS_PANE (source_widget) &&
GNM_PANE (source_widget)->simple.scg == scg)) {
/* same scg */
GocCanvas *canvas = GOC_CANVAS (widget);
@@ -1184,7 +1184,7 @@ cb_pane_drag_leave (GtkWidget *widget, GdkDragContext *context,
GnmPane *source_pane;
WBCGtk *wbcg;
- if (!source_widget || !IS_GNM_PANE (source_widget)) return;
+ if (!source_widget || !GNM_IS_PANE (source_widget)) return;
source_pane = GNM_PANE (source_widget);
@@ -1489,7 +1489,7 @@ gnm_pane_redraw_range (GnmPane *pane, GnmRange const *r)
Sheet *sheet;
double scale = goc_canvas_get_pixels_per_unit (GOC_CANVAS (pane));
- g_return_if_fail (IS_GNM_PANE (pane));
+ g_return_if_fail (GNM_IS_PANE (pane));
scg = pane->simple.scg;
sheet = scg_sheet (scg);
@@ -1748,7 +1748,7 @@ gnm_pane_handle_motion (GnmPane *pane,
gint64 dx = 0, dy = 0, left, top;
GtkAllocation pa, p0a, p1a, p3a;
- g_return_val_if_fail (IS_GNM_PANE (pane), FALSE);
+ g_return_val_if_fail (GNM_IS_PANE (pane), FALSE);
g_return_val_if_fail (GOC_IS_CANVAS (canvas), FALSE);
g_return_val_if_fail (slide_handler != NULL, FALSE);
@@ -1868,7 +1868,7 @@ gnm_pane_slide_init (GnmPane *pane)
{
GnmPane *pane0, *pane1, *pane3;
- g_return_if_fail (IS_GNM_PANE (pane));
+ g_return_if_fail (GNM_IS_PANE (pane));
pane0 = scg_pane (pane->simple.scg, 0);
pane1 = scg_pane (pane->simple.scg, 1);
diff --git a/src/gnm-pane.h b/src/gnm-pane.h
index 1110a04..42e3ab2 100644
--- a/src/gnm-pane.h
+++ b/src/gnm-pane.h
@@ -9,7 +9,7 @@ G_BEGIN_DECLS
#define GNM_PANE_TYPE (gnm_pane_get_type ())
#define GNM_PANE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_PANE_TYPE, GnmPane))
-#define IS_GNM_PANE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_PANE_TYPE))
+#define GNM_IS_PANE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_PANE_TYPE))
GType gnm_pane_get_type (void);
GnmPane *gnm_pane_new (SheetControlGUI *scg,
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index c4081c8..57f54ac 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -177,7 +177,7 @@ plugin_service_function_group_func_ref_notify (GnmFunc *fn_def, int refcount)
GOPluginService *service;
service = gnm_func_get_user_data (fn_def);
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service));
if (refcount == 0) {
go_plugin_use_unref (service->plugin);
} else {
@@ -745,7 +745,7 @@ gnm_plugin_loader_module_func_desc_load (GOPluginService *service,
ServiceLoaderDataFunctionGroup *loader_data;
gpointer func_index_ptr;
- g_return_val_if_fail (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service), FALSE);
+ g_return_val_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service), FALSE);
g_return_val_if_fail (name != NULL, FALSE);
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
@@ -766,7 +766,7 @@ gnm_plugin_loader_module_load_service_function_group (GOPluginLoader *loader,
gchar *fn_info_array_name;
GnmFuncDescriptor *module_fn_info_array = NULL;
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service));
GO_INIT_RET_ERROR_INFO (ret_error);
fn_info_array_name = g_strconcat (
@@ -830,7 +830,7 @@ gnm_plugin_loader_module_func_exec_action (GOPluginService *service,
gpointer action_index_ptr;
int action_index;
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_UI (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_UI (service));
GO_INIT_RET_ERROR_INFO (ret_error);
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
@@ -856,7 +856,7 @@ gnm_plugin_loader_module_load_service_ui (GOPluginLoader *loader,
ServiceLoaderDataUI *loader_data;
gint i;
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_UI (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_UI (service));
GO_INIT_RET_ERROR_INFO (ret_error);
ui_actions_array_name = g_strconcat (
@@ -899,7 +899,7 @@ gnm_plugin_loader_module_load_service_solver (GOPluginLoader *loader,
GnmSolverCreator creator;
GnmSolverFactoryFunctional functional;
- g_return_if_fail (IS_GNM_PLUGIN_SERVICE_SOLVER (service));
+ g_return_if_fail (GNM_IS_PLUGIN_SERVICE_SOLVER (service));
GO_INIT_RET_ERROR_INFO (ret_error);
@@ -929,11 +929,11 @@ gnm_plugin_loader_module_load_service_solver (GOPluginLoader *loader,
static gboolean
gplm_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
{
- if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s))
+ if (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (s))
gnm_plugin_loader_module_load_service_function_group (l, s, err);
- else if (IS_GNM_PLUGIN_SERVICE_UI (s))
+ else if (GNM_IS_PLUGIN_SERVICE_UI (s))
gnm_plugin_loader_module_load_service_ui (l, s, err);
- else if (IS_GNM_PLUGIN_SERVICE_SOLVER (s))
+ else if (GNM_IS_PLUGIN_SERVICE_SOLVER (s))
gnm_plugin_loader_module_load_service_solver (l, s, err);
else
return FALSE;
@@ -943,13 +943,13 @@ gplm_service_load (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
static gboolean
gplm_service_unload (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
{
- if (IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP (s)) {
+ if (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (s)) {
PluginServiceFunctionGroupCallbacks *cbs = go_plugin_service_get_cbs (s);
cbs->func_desc_load = NULL;
- } else if (IS_GNM_PLUGIN_SERVICE_UI (s)) {
+ } else if (GNM_IS_PLUGIN_SERVICE_UI (s)) {
PluginServiceUICallbacks *cbs = go_plugin_service_get_cbs (s);
cbs->plugin_func_exec_action = NULL;
- } else if (IS_GNM_PLUGIN_SERVICE_SOLVER (s)) {
+ } else if (GNM_IS_PLUGIN_SERVICE_SOLVER (s)) {
PluginServiceSolverCallbacks *cbs =
go_plugin_service_get_cbs (s);
cbs->creator = NULL;
diff --git a/src/gnm-plugin.h b/src/gnm-plugin.h
index 0768e03..d42b617 100644
--- a/src/gnm-plugin.h
+++ b/src/gnm-plugin.h
@@ -16,7 +16,7 @@ GType gnm_plugin_loader_module_get_type (void);
#define GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE (plugin_service_function_group_get_type ())
#define GNM_PLUGIN_SERVICE_FUNCTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE, PluginServiceFunctionGroup))
-#define IS_GNM_PLUGIN_SERVICE_FUNCTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o),
GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE))
+#define GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o),
GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE))
GType plugin_service_function_group_get_type (void);
typedef struct _PluginServiceFunctionGroup PluginServiceFunctionGroup;
@@ -27,7 +27,7 @@ typedef struct {
#define GNM_PLUGIN_SERVICE_UI_TYPE (plugin_service_ui_get_type ())
#define GNM_PLUGIN_SERVICE_UI(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_PLUGIN_SERVICE_UI_TYPE,
PluginServiceUI))
-#define IS_GNM_PLUGIN_SERVICE_UI(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_PLUGIN_SERVICE_UI_TYPE))
+#define GNM_IS_PLUGIN_SERVICE_UI(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_PLUGIN_SERVICE_UI_TYPE))
GType plugin_service_ui_get_type (void);
typedef struct _PluginServiceUI PluginServiceUI;
@@ -48,7 +48,7 @@ typedef struct {
#define GNM_PLUGIN_SERVICE_SOLVER_TYPE (plugin_service_solver_get_type ())
#define GNM_PLUGIN_SERVICE_SOLVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_PLUGIN_SERVICE_SOLVER_TYPE,
PluginServiceSolver))
-#define IS_GNM_PLUGIN_SERVICE_SOLVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_PLUGIN_SERVICE_SOLVER_TYPE))
+#define GNM_IS_PLUGIN_SERVICE_SOLVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_PLUGIN_SERVICE_SOLVER_TYPE))
GType plugin_service_solver_get_type (void);
typedef struct _PluginServiceSolver PluginServiceSolver;
diff --git a/src/gnm-sheet-slicer.c b/src/gnm-sheet-slicer.c
index 3917e1f..628792b 100644
--- a/src/gnm-sheet-slicer.c
+++ b/src/gnm-sheet-slicer.c
@@ -203,7 +203,7 @@ void
gnm_sheet_slicer_set_sheet (GnmSheetSlicer *gss, Sheet *sheet)
{
g_return_if_fail (IS_SHEET (sheet));
- g_return_if_fail (IS_GNM_SHEET_SLICER (gss));
+ g_return_if_fail (GNM_IS_SHEET_SLICER (gss));
g_return_if_fail (NULL == gss->sheet);
g_object_ref (gss);
@@ -214,7 +214,7 @@ gnm_sheet_slicer_set_sheet (GnmSheetSlicer *gss, Sheet *sheet)
void
gnm_sheet_slicer_clear_sheet (GnmSheetSlicer *gss)
{
- g_return_if_fail (IS_GNM_SHEET_SLICER (gss));
+ g_return_if_fail (GNM_IS_SHEET_SLICER (gss));
g_return_if_fail (NULL != gss->sheet);
gss->sheet->slicers = g_slist_remove (gss->sheet->slicers, gss);
@@ -225,14 +225,14 @@ gnm_sheet_slicer_clear_sheet (GnmSheetSlicer *gss)
GnmRange const *
gnm_sheet_slicer_get_range (GnmSheetSlicer const *gss)
{
- g_return_val_if_fail (IS_GNM_SHEET_SLICER (gss), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_SLICER (gss), NULL);
return &gss->range;
}
void
gnm_sheet_slicer_set_range (GnmSheetSlicer *gss, GnmRange const *r)
{
- g_return_if_fail (IS_GNM_SHEET_SLICER (gss));
+ g_return_if_fail (GNM_IS_SHEET_SLICER (gss));
gss->range = *r;
}
@@ -246,7 +246,7 @@ gnm_sheet_slicer_set_range (GnmSheetSlicer *gss, GnmRange const *r)
gboolean
gnm_sheet_slicer_overlaps_range (GnmSheetSlicer const *gss, GnmRange const *r)
{
- g_return_val_if_fail (IS_GNM_SHEET_SLICER (gss), FALSE);
+ g_return_val_if_fail (GNM_IS_SHEET_SLICER (gss), FALSE);
return range_overlap (&gss->range, r);
}
@@ -267,7 +267,7 @@ gnm_sheet_slicer_field_header_at_pos (GnmSheetSlicer const *gss,
int res = -1;
unsigned int c, r;
- g_return_val_if_fail (IS_GNM_SHEET_SLICER (gss), NULL);
+ g_return_val_if_fail (GNM_IS_SHEET_SLICER (gss), NULL);
/* 0) TODO page fields */
if (pos->col < gss->range.start.col || pos->row < gss->range.start.row)
@@ -371,7 +371,7 @@ gnm_sheet_slicer_regenerate (GnmSheetSlicer *gss)
GArray *permutation, *rows;
unsigned int i, n;
- g_return_if_fail (IS_GNM_SHEET_SLICER (gss));
+ g_return_if_fail (GNM_IS_SHEET_SLICER (gss));
g_return_if_fail (IS_SHEET (gss->sheet));
g_return_if_fail (NULL != gss->base.cache);
@@ -386,14 +386,14 @@ gnm_sheet_slicer_regenerate (GnmSheetSlicer *gss)
GnmSheetSlicerLayout
gnm_sheet_slicer_get_layout (GnmSheetSlicer const *gss)
{
- g_return_val_if_fail (IS_GNM_SHEET_SLICER (gss), GSS_Layout_XL_outline);
+ g_return_val_if_fail (GNM_IS_SHEET_SLICER (gss), GSS_Layout_XL_outline);
return gss->layout;
}
void
gnm_sheet_slicer_set_layout (GnmSheetSlicer *gss, GnmSheetSlicerLayout l)
{
- g_return_if_fail (IS_GNM_SHEET_SLICER (gss));
+ g_return_if_fail (GNM_IS_SHEET_SLICER (gss));
gss->layout = l;
}
diff --git a/src/gnm-sheet-slicer.h b/src/gnm-sheet-slicer.h
index ae21e1e..18c1852 100644
--- a/src/gnm-sheet-slicer.h
+++ b/src/gnm-sheet-slicer.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
#define GNM_SHEET_SLICER_TYPE (gnm_sheet_slicer_get_type ())
#define GNM_SHEET_SLICER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_SHEET_SLICER_TYPE, GnmSheetSlicer))
-#define IS_GNM_SHEET_SLICER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_SHEET_SLICER_TYPE))
+#define GNM_IS_SHEET_SLICER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_SHEET_SLICER_TYPE))
GType gnm_sheet_slicer_get_type (void);
diff --git a/src/gnm-so-polygon.h b/src/gnm-so-polygon.h
index e497973..10f319e 100644
--- a/src/gnm-so-polygon.h
+++ b/src/gnm-so-polygon.h
@@ -7,7 +7,7 @@
G_BEGIN_DECLS
#define GNM_SO_POLYGON_TYPE (gnm_so_polygon_get_type ())
-#define IS_GNM_SO_POLYGON(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_SO_POLYGON_TYPE))
+#define GNM_IS_SO_POLYGON(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_SO_POLYGON_TYPE))
GType gnm_so_polygon_get_type (void);
G_END_DECLS
diff --git a/src/graph.c b/src/graph.c
index ff17043..0624ed8 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1457,9 +1457,9 @@ gnm_go_data_get_dep (GOData const *dat)
{
if (IS_GNM_GO_DATA_SCALAR (dat))
return &((GnmGODataScalar *)dat)->dep;
- if (IS_GNM_GO_DATA_VECTOR (dat))
+ if (GNM_IS_GO_DATA_VECTOR (dat))
return &((GnmGODataVector *)dat)->dep;
- if (IS_GNM_GO_DATA_MATRIX (dat))
+ if (GNM_IS_GO_DATA_MATRIX (dat))
return &((GnmGODataMatrix *)dat)->dep;
return NULL;
}
diff --git a/src/graph.h b/src/graph.h
index 07ae9fb..7b2b6b8 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -25,7 +25,7 @@ GOData *gnm_go_data_scalar_new_expr (Sheet *sheet, GnmExprTop const *texpr);
#define GNM_GO_DATA_VECTOR_TYPE (gnm_go_data_vector_get_type ())
#define GNM_GO_DATA_VECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_GO_DATA_VECTOR_TYPE, GnmGODataVector))
-#define IS_GNM_GO_DATA_VECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_GO_DATA_VECTOR_TYPE))
+#define GNM_IS_GO_DATA_VECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_GO_DATA_VECTOR_TYPE))
typedef struct _GnmGODataVector GnmGODataVector;
GType gnm_go_data_vector_get_type (void);
@@ -33,7 +33,7 @@ GOData *gnm_go_data_vector_new_expr (Sheet *sheet, GnmExprTop const *texpr);
#define GNM_GO_DATA_MATRIX_TYPE (gnm_go_data_matrix_get_type ())
#define GNM_GO_DATA_MATRIX(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_GO_DATA_MATRIX_TYPE, GnmGODataMatrix))
-#define IS_GNM_GO_DATA_MATRIX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_GO_DATA_MATRIX_TYPE))
+#define GNM_IS_GO_DATA_MATRIX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_GO_DATA_MATRIX_TYPE))
typedef struct _GnmGODataMatrix GnmGODataMatrix;
GType gnm_go_data_matrix_get_type (void);
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index 1c8ac96..065d0ba 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -125,7 +125,7 @@ text_to_cell_region (WBCGtk *wbcg,
char const *opt_encoding,
gboolean fixed_encoding)
{
- Workbook *wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ Workbook *wb = wb_control_get_workbook (GNM_WBC (wbcg));
DialogStfResult_t *dialogresult;
GnmCellRegion *cr = NULL;
gboolean oneline;
@@ -203,7 +203,7 @@ text_content_received (GtkClipboard *clipboard, GtkSelectionData *sel,
{
GnmGtkClipboardCtxt *ctxt = closure;
WBCGtk *wbcg = ctxt->wbcg;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GnmPasteTarget *pt = ctxt->paste_target;
GnmCellRegion *content = NULL;
GdkAtom target = gtk_selection_data_get_target (sel);
@@ -261,7 +261,7 @@ utf8_content_received (GtkClipboard *clipboard, const gchar *text,
{
GnmGtkClipboardCtxt *ctxt = closure;
WBCGtk *wbcg = ctxt->wbcg;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GnmPasteTarget *pt = ctxt->paste_target;
GnmCellRegion *content = NULL;
@@ -471,7 +471,7 @@ table_content_received (GtkClipboard *clipboard, GtkSelectionData *sel,
{
GnmGtkClipboardCtxt *ctxt = closure;
WBCGtk *wbcg = ctxt->wbcg;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GnmPasteTarget *pt = ctxt->paste_target;
GnmCellRegion *content = NULL;
GdkAtom target = gtk_selection_data_get_target (sel);
@@ -1192,7 +1192,7 @@ gnm_x_store_clipboard_if_needed (Workbook *wb)
if (sheet && sheet->workbook == wb) {
WORKBOOK_FOREACH_CONTROL (wb, view, control, {
- if (IS_WBC_GTK (control)) {
+ if (GNM_IS_WBC_GTK (control)) {
wbcg = WBC_GTK (control);
}
});
diff --git a/src/gui-file.c b/src/gui-file.c
index 3b6d149..6fe93df 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -83,17 +83,17 @@ void
gui_wb_view_show (WBCGtk *wbcg, WorkbookView *wbv)
{
WBCGtk *new_wbcg = NULL;
- Workbook *tmp_wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ Workbook *tmp_wb = wb_control_get_workbook (GNM_WBC (wbcg));
if (go_doc_is_pristine (GO_DOC (tmp_wb))) {
g_object_ref (wbcg);
g_object_unref (tmp_wb);
- wb_control_set_view (WORKBOOK_CONTROL (wbcg), wbv, NULL);
- wb_control_init_state (WORKBOOK_CONTROL (wbcg));
+ wb_control_set_view (GNM_WBC (wbcg), wbv, NULL);
+ wb_control_init_state (GNM_WBC (wbcg));
} else {
GdkScreen *screen = gtk_window_get_screen (wbcg_toplevel (wbcg));
WorkbookControl *new_wbc =
- workbook_control_new_wrapper (WORKBOOK_CONTROL (wbcg),
+ workbook_control_new_wrapper (GNM_WBC (wbcg),
wbv, NULL, screen);
new_wbcg = WBC_GTK (new_wbc);
@@ -233,7 +233,7 @@ gui_file_open (WBCGtk *wbcg, GnmFileOpenStyle type, char const *default_format)
GSList *uris = NULL;
char const *encoding = NULL;
GOFileOpener *fo = NULL;
- Workbook *workbook = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ Workbook *workbook = wb_control_get_workbook (GNM_WBC (wbcg));
all_openers = go_get_file_openers ();
@@ -778,7 +778,7 @@ gui_file_save (WBCGtk *wbcg, WorkbookView *wb_view)
gboolean
gui_file_export_repeat (WBCGtk *wbcg)
{
- WorkbookView *wb_view = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wb_view = wb_control_view (GNM_WBC (wbcg));
Workbook *wb = wb_view_get_workbook (wb_view);
GOFileSaver *fs = workbook_get_file_exporter (wb);
gchar const *last_uri = workbook_get_last_export_uri (wb);
diff --git a/src/gui-util.c b/src/gui-util.c
index 63b8897..4c08cea 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -310,7 +310,7 @@ gnumeric_keyed_dialog (WBCGtk *wbcg, GtkWindow *dialog, char const *key)
{
KeyedDialogContext *ctxt;
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
g_return_if_fail (GTK_IS_WINDOW (dialog));
g_return_if_fail (key != NULL);
@@ -1129,8 +1129,8 @@ gnm_dialog_setup_destroy_handlers (GtkDialog *dialog,
GnmDialogDestroyOptions what)
{
GnmDialogDestroySignals *dd = g_new (GnmDialogDestroySignals, 1);
- Workbook *wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
- Sheet *sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (wbcg));
+ Workbook *wb = wb_control_get_workbook (GNM_WBC (wbcg));
+ Sheet *sheet = wb_control_cur_sheet (GNM_WBC (wbcg));
int N = workbook_sheet_count (wb), i;
GPtrArray *os = g_ptr_array_new ();
diff --git a/src/hlink.c b/src/hlink.c
index 393f2da..b308c93 100644
--- a/src/hlink.c
+++ b/src/hlink.c
@@ -59,7 +59,7 @@
gboolean
gnm_hlink_activate (GnmHLink *lnk, WBCGtk *wbcg)
{
- g_return_val_if_fail (IS_GNM_HLINK (lnk), FALSE);
+ g_return_val_if_fail (GNM_IS_HLINK (lnk), FALSE);
return GET_CLASS (lnk)->Activate (lnk, wbcg);
}
@@ -112,7 +112,7 @@ GSF_CLASS_ABSTRACT (GnmHLink, gnm_hlink,
gchar const *
gnm_hlink_get_target (GnmHLink const *lnk)
{
- g_return_val_if_fail (IS_GNM_HLINK (lnk), NULL);
+ g_return_val_if_fail (GNM_IS_HLINK (lnk), NULL);
return lnk->target;
}
@@ -121,7 +121,7 @@ gnm_hlink_set_target (GnmHLink *lnk, gchar const *target)
{
gchar *tmp;
- g_return_if_fail (IS_GNM_HLINK (lnk));
+ g_return_if_fail (GNM_IS_HLINK (lnk));
tmp = g_strdup (target);
g_free (lnk->target);
@@ -131,7 +131,7 @@ gnm_hlink_set_target (GnmHLink *lnk, gchar const *target)
gchar const *
gnm_hlink_get_tip (GnmHLink const *lnk)
{
- g_return_val_if_fail (IS_GNM_HLINK (lnk), NULL);
+ g_return_val_if_fail (GNM_IS_HLINK (lnk), NULL);
return lnk->tip;
}
@@ -140,7 +140,7 @@ gnm_hlink_set_tip (GnmHLink *lnk, gchar const *tip)
{
gchar *tmp;
- g_return_if_fail (IS_GNM_HLINK (lnk));
+ g_return_if_fail (GNM_IS_HLINK (lnk));
tmp = g_strdup (tip);
g_free (lnk->tip);
@@ -161,7 +161,7 @@ gnm_hlink_cur_wb_activate (GnmHLink *lnk, WBCGtk *wbcg)
GnmRangeRef const *r;
GnmCellPos tmp;
Sheet *target_sheet;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wbcg_cur_sheet (wbcg);
SheetView *sv;
GnmValue *target;
diff --git a/src/hlink.h b/src/hlink.h
index dd703b8..658a4a2 100644
--- a/src/hlink.h
+++ b/src/hlink.h
@@ -10,11 +10,11 @@ G_BEGIN_DECLS
#define GNM_HLINK_TYPE (gnm_hlink_get_type ())
#define GNM_HLINK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_HLINK_TYPE, GnmHLink))
-#define IS_GNM_HLINK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_HLINK_TYPE))
+#define GNM_IS_HLINK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_HLINK_TYPE))
#define GNM_HLINK_URL_TYPE (gnm_hlink_url_get_type ())
#define GNM_HLINK_URL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_HLINK_URL_TYPE, GnmHLinkURL))
-#define IS_GNM_HLINK_URL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_HLINK_URL_TYPE))
+#define GNM_IS_HLINK_URL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_HLINK_URL_TYPE))
GnmHLink *sheet_hlink_find (Sheet const *sheet, GnmCellPos const *pos);
diff --git a/src/input-msg.h b/src/input-msg.h
index fbf0b53..919bd97 100644
--- a/src/input-msg.h
+++ b/src/input-msg.h
@@ -9,7 +9,7 @@ G_BEGIN_DECLS
#define GNM_INPUT_MSG_TYPE (gnm_input_msg_get_type ())
#define GNM_INPUT_MSG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_INPUT_MSG_TYPE, GnmInputMsg))
-#define IS_GNM_INPUT_MSG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_INPUT_MSG_TYPE))
+#define GNM_IS_INPUT_MSG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_INPUT_MSG_TYPE))
GType gnm_input_msg_get_type (void);
GnmInputMsg *gnm_input_msg_new (char const *msg, char const *title);
diff --git a/src/print.c b/src/print.c
index ee5672d..5818e80 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1308,7 +1308,7 @@ gnm_begin_print_cb (GtkPrintOperation *operation,
(settings, GNUMERIC_PRINT_SETTING_IGNORE_PAGE_BREAKS_KEY, pi->ignore_pb ? 1 : 0);
}
- if (NULL != pi->wbc && IS_WBC_GTK(pi->wbc)) {
+ if (NULL != pi->wbc && GNM_IS_WBC_GTK(pi->wbc)) {
pi->progress = gtk_message_dialog_new (wbcg_toplevel (WBC_GTK (pi->wbc)),
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1772,7 +1772,7 @@ gnm_print_sheet (WorkbookControl *wbc, Sheet *sheet,
pi = printing_instance_new ();
pi->wb = sheet->workbook;
- pi->wbc = wbc ? WORKBOOK_CONTROL (wbc) : NULL;
+ pi->wbc = wbc ? GNM_WBC (wbc) : NULL;
pi->sheet = sheet;
pi->preview = preview;
@@ -1829,7 +1829,7 @@ gnm_print_sheet (WorkbookControl *wbc, Sheet *sheet,
gtk_print_operation_set_use_full_page (print, FALSE);
gtk_print_operation_set_unit (print, GTK_UNIT_POINTS);
- if (NULL != wbc && IS_WBC_GTK(wbc))
+ if (NULL != wbc && GNM_IS_WBC_GTK(wbc))
parent = wbcg_toplevel (WBC_GTK (wbc));
if (preview_via_pdf || export_dst) {
@@ -2002,7 +2002,7 @@ gnm_print_so (WorkbookControl *wbc, GPtrArray *sos,
so = g_ptr_array_index (sos, 0),
sheet = sheet_object_get_sheet (so);
- if (NULL != wbc && IS_WBC_GTK(wbc))
+ if (NULL != wbc && GNM_IS_WBC_GTK(wbc))
parent = wbcg_toplevel (WBC_GTK (wbc));
print = gtk_print_operation_new ();
diff --git a/src/search.h b/src/search.h
index 9e57835..879088f 100644
--- a/src/search.h
+++ b/src/search.h
@@ -13,7 +13,7 @@ char *gnm_search_normalize (const char *txt);
#define GNM_SEARCH_REPLACE_TYPE (gnm_search_replace_get_type ())
#define GNM_SEARCH_REPLACE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_SEARCH_REPLACE_TYPE,
GnmSearchReplace))
-#define IS_GNM_SEARCH_REPLACE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_SEARCH_REPLACE_TYPE))
+#define GNM_IS_SEARCH_REPLACE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_SEARCH_REPLACE_TYPE))
typedef enum {
GNM_SRE_FAIL = 0,
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index dbb2ed7..42ff337 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -936,7 +936,7 @@ gnm_pane_make_cell_visible (GnmPane *pane, int col, int row,
GnmRange range;
GtkAllocation ca;
- g_return_if_fail (IS_GNM_PANE (pane));
+ g_return_if_fail (GNM_IS_PANE (pane));
/* Avoid calling this before the canvas is realized: We do not know the
* visible area, and would unconditionally scroll the cell to the top
@@ -1564,7 +1564,7 @@ sheet_control_gui_new (SheetView *sv, WBCGtk *wbcg)
scg = g_object_new (SHEET_CONTROL_GUI_TYPE, NULL);
scg->wbcg = wbcg;
- scg->sheet_control.wbc = WORKBOOK_CONTROL (wbcg);
+ scg->sheet_control.wbc = GNM_WBC (wbcg);
g_object_weak_ref (G_OBJECT (wbcg),
(GWeakNotify) cb_wbc_destroyed,
@@ -2056,7 +2056,7 @@ context_menu_handler (GnumericPopupMenuElement const *element,
dialog_cell_comment (wbcg, sheet, &sv->edit_pos);
break;
case CONTEXT_COMMENT_REMOVE:
- cmd_selection_clear (WORKBOOK_CONTROL (wbcg), CLEAR_COMMENTS);
+ cmd_selection_clear (GNM_WBC (wbcg), CLEAR_COMMENTS);
break;
case CONTEXT_HYPERLINK_EDIT:
case CONTEXT_HYPERLINK_ADD:
@@ -2520,7 +2520,7 @@ scg_mode_edit (SheetControlGUI *scg)
wbcg_edit_finish (wbcg, WBC_EDIT_REJECT, NULL);
if (wbcg)
- wb_control_update_action_sensitivity (WORKBOOK_CONTROL (wbcg));
+ wb_control_update_action_sensitivity (GNM_WBC (wbcg));
}
static void
@@ -2937,7 +2937,7 @@ scg_objects_drag_commit (SheetControlGUI *scg, int drag_type,
if (undo_title)
*undo_title = text;
} else {
- cmd_generic (WORKBOOK_CONTROL (scg_wbcg (scg)),
+ cmd_generic (GNM_WBC (scg_wbcg (scg)),
text, undo, redo);
g_free (text);
}
@@ -4120,7 +4120,7 @@ scg_drag_receive_same_process (SheetControlGUI *scg, GtkWidget *source_widget,
GnmPane *pane;
g_return_if_fail (source_widget != NULL);
- g_return_if_fail (IS_GNM_PANE (source_widget));
+ g_return_if_fail (GNM_IS_PANE (source_widget));
pane = GNM_PANE (source_widget);
x *= goc_canvas_get_pixels_per_unit (GOC_CANVAS (pane));
@@ -4183,7 +4183,7 @@ scg_drag_receive_same_process (SheetControlGUI *scg, GtkWidget *source_widget,
redo = go_undo_combine (nudge_redo, redo);
} else
scg_objects_drag_commit (scg, 8, FALSE, &undo, &redo, &title);
- cmd_generic (WORKBOOK_CONTROL (scg_wbcg (scg)), title, undo, redo);
+ cmd_generic (GNM_WBC (scg_wbcg (scg)), title, undo, redo);
g_free (title);
} else {
GnmCellRegion *content;
diff --git a/src/sheet-object-component.c b/src/sheet-object-component.c
index 8924148..6204d3a 100644
--- a/src/sheet-object-component.c
+++ b/src/sheet-object-component.c
@@ -381,7 +381,7 @@ gnm_soc_user_config (SheetObject *so, SheetControl *sc)
gnm_soc_user_config_t *data = g_new0 (gnm_soc_user_config_t, 1);
data->so = so;
data->component = new_comp;
- data->wbc = WORKBOOK_CONTROL (scg_wbcg (SHEET_CONTROL_GUI (sc)));
+ data->wbc = GNM_WBC (scg_wbcg (SHEET_CONTROL_GUI (sc)));
data->signal = g_signal_connect (new_comp, "changed", G_CALLBACK (component_changed_cb),
data);
g_object_set_data_full (G_OBJECT (w), "editor", data, (GDestroyNotify) destroy_cb);
wbc_gtk_attach_guru (scg_wbcg (SHEET_CONTROL_GUI (sc)), w);
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index 80eb150..c13f72c 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -201,7 +201,7 @@ gnm_sog_new_view (SheetObject *so, SheetObjectViewContainer *container)
{
GnmPane *pane;
SheetObjectGraph *sog = SHEET_OBJECT_GRAPH (so);
- if (IS_GNM_PANE (container)) {
+ if (GNM_IS_PANE (container)) {
GocItem *view;
pane = GNM_PANE (container);
view = goc_item_new (pane->object_views,
@@ -494,7 +494,7 @@ gnm_sog_user_config (SheetObject *so, SheetControl *sc)
data = g_new0 (gnm_sog_user_config_t, 1);
data->so = so;
- data->wbc = WORKBOOK_CONTROL (wbcg);
+ data->wbc = GNM_WBC (wbcg);
closure = g_cclosure_new (G_CALLBACK (cb_update_graph), data,
(GClosureNotify) gnm_sog_user_config_free_data);
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 8fceb20..1bc5d59 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -481,7 +481,7 @@ cb_frame_config_ok_clicked (G_GNUC_UNUSED GtkWidget *button, FrameConfigState *s
{
gchar const *text = gtk_entry_get_text(GTK_ENTRY(state->label));
- cmd_so_set_frame_label (WORKBOOK_CONTROL (state->wbcg),
+ cmd_so_set_frame_label (GNM_WBC (state->wbcg),
SHEET_OBJECT (state->swf),
g_strdup (state->old_label), g_strdup (text));
gtk_widget_destroy (state->dialog);
@@ -1030,7 +1030,7 @@ cb_button_config_ok_clicked (G_GNUC_UNUSED GtkWidget *button, ButtonConfigState
NULL, FALSE, GNM_EXPR_PARSE_DEFAULT);
gchar const *text = gtk_entry_get_text(GTK_ENTRY(state->label));
- cmd_so_set_button (WORKBOOK_CONTROL (state->wbcg), so,
+ cmd_so_set_button (GNM_WBC (state->wbcg), so,
texpr, g_strdup (state->old_label), g_strdup (text));
gtk_widget_destroy (state->dialog);
@@ -1639,7 +1639,7 @@ cb_adjustment_config_ok_clicked (G_GNUC_UNUSED GtkWidget *button, AdjustmentConf
? gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (state->direction_h))
: state->swa->horizontal;
- cmd_so_set_adjustment (WORKBOOK_CONTROL (state->wbcg), so,
+ cmd_so_set_adjustment (GNM_WBC (state->wbcg), so,
texpr,
horizontal,
gtk_spin_button_get_value_as_int (
@@ -2492,7 +2492,7 @@ cb_checkbox_config_ok_clicked (G_GNUC_UNUSED GtkWidget *button, CheckboxConfigSt
NULL, FALSE, GNM_EXPR_PARSE_DEFAULT);
gchar const *text = gtk_entry_get_text(GTK_ENTRY(state->label));
- cmd_so_set_checkbox (WORKBOOK_CONTROL (state->wbcg), so,
+ cmd_so_set_checkbox (GNM_WBC (state->wbcg), so,
texpr, g_strdup (state->old_label), g_strdup (text));
gtk_widget_destroy (state->dialog);
@@ -3219,7 +3219,7 @@ cb_radio_button_config_ok_clicked (G_GNUC_UNUSED GtkWidget *button, RadioButtonC
gchar const *val = gtk_entry_get_text (GTK_ENTRY (state->value));
GnmValue *new_val = so_parse_value (so, val);
- cmd_so_set_radio_button (WORKBOOK_CONTROL (state->wbcg), so,
+ cmd_so_set_radio_button (GNM_WBC (state->wbcg), so,
texpr,
g_strdup (state->old_label), g_strdup (text),
value_dup (state->old_value), new_val);
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 3b35699..f1e69de 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -1299,7 +1299,7 @@ sheet_object_view_enter_notify (GocItem *item, double x, double y)
{
SheetObject *so;
- if (IS_GNM_PANE (item->canvas) && scg_wbcg (GNM_SIMPLE_CANVAS (item->canvas)->scg)->new_object) {
+ if (GNM_IS_PANE (item->canvas) && scg_wbcg (GNM_SIMPLE_CANVAS (item->canvas)->scg)->new_object) {
GnmItemGrid *grid = GNM_PANE (item->canvas)->grid;
return GOC_ITEM_GET_CLASS (grid)->enter_notify (GOC_ITEM (grid), x, y);
}
@@ -1384,7 +1384,7 @@ sheet_object_view_button_pressed (GocItem *item, int button, double x, double y)
{
GnmPane *pane;
SheetObject *so;
- if (IS_GNM_PANE (item->canvas)) {
+ if (GNM_IS_PANE (item->canvas)) {
if (scg_wbcg (GNM_SIMPLE_CANVAS (item->canvas)->scg)->new_object) {
GnmItemGrid *grid = GNM_PANE (item->canvas)->grid;
return GOC_ITEM_GET_CLASS (grid)->button_pressed (GOC_ITEM (grid), button, x, y);
@@ -1448,7 +1448,7 @@ sheet_object_view_button_pressed (GocItem *item, int button, double x, double y)
static gboolean
sheet_object_view_button2_pressed (GocItem *item, int button, double x, double y)
{
- if (button == 1 && !IS_GNM_PANE (item->canvas)) {
+ if (button == 1 && !GNM_IS_PANE (item->canvas)) {
SheetControl *sc = SHEET_CONTROL (g_object_get_data (G_OBJECT (item->canvas),
"sheet-control"));
SheetObject *so = (SheetObject *) g_object_get_qdata (G_OBJECT (item), sov_so_quark);
diff --git a/src/ssconvert.c b/src/ssconvert.c
index 4e9cedc..5f8c138 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -512,7 +512,7 @@ run_solver (Sheet *sheet, WorkbookView *wbv)
WorkbookControl *wbc;
GnmSolver *sol = NULL;
- wbc = g_object_new (WORKBOOK_CONTROL_TYPE, NULL);
+ wbc = g_object_new (GNM_WBC_TYPE, NULL);
wb_control_set_view (wbc, wbv, NULL);
/* Pick a functional algorithm. */
@@ -603,7 +603,7 @@ run_tool_test (const char *tool, char **argv, WorkbookView *wbv)
}
wb = wb_view_get_workbook (wbv);
- wbc = g_object_new (WORKBOOK_CONTROL_TYPE, NULL);
+ wbc = g_object_new (GNM_WBC_TYPE, NULL);
wb_control_set_view (wbc, wbv, NULL);
sheet = GET_ARG (SHEET_ARG, "sheet", wb_view_cur_sheet (wbv));
diff --git a/src/stf-export.c b/src/stf-export.c
index b0f7474..f545e70 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -75,7 +75,7 @@ enum {
static void
cb_sheet_destroyed (GnmStfExport *stfe, gpointer deadsheet)
{
- g_return_if_fail (IS_GNM_STF_EXPORT (stfe));
+ g_return_if_fail (GNM_IS_STF_EXPORT (stfe));
stfe->sheet_list = g_slist_remove (stfe->sheet_list, deadsheet);
}
@@ -91,7 +91,7 @@ gnm_stf_export_options_sheet_list_clear (GnmStfExport *stfe)
{
GSList *l;
- g_return_if_fail (IS_GNM_STF_EXPORT (stfe));
+ g_return_if_fail (GNM_IS_STF_EXPORT (stfe));
for (l = stfe->sheet_list; l; l = l->next) {
@@ -117,7 +117,7 @@ gnm_stf_export_options_sheet_list_clear (GnmStfExport *stfe)
void
gnm_stf_export_options_sheet_list_add (GnmStfExport *stfe, Sheet *sheet)
{
- g_return_if_fail (IS_GNM_STF_EXPORT (stfe));
+ g_return_if_fail (GNM_IS_STF_EXPORT (stfe));
g_return_if_fail (IS_SHEET (sheet));
g_object_weak_ref (G_OBJECT (sheet),
@@ -137,7 +137,7 @@ gnm_stf_export_options_sheet_list_add (GnmStfExport *stfe, Sheet *sheet)
GSList *
gnm_stf_export_options_sheet_list_get (const GnmStfExport *stfe)
{
- g_return_val_if_fail (IS_GNM_STF_EXPORT (stfe), NULL);
+ g_return_val_if_fail (GNM_IS_STF_EXPORT (stfe), NULL);
return stfe->sheet_list;
}
@@ -333,7 +333,7 @@ gnm_stf_export (GnmStfExport *stfe)
gboolean result = TRUE;
char *old_locale = NULL;
- g_return_val_if_fail (IS_GNM_STF_EXPORT (stfe), FALSE);
+ g_return_val_if_fail (GNM_IS_STF_EXPORT (stfe), FALSE);
g_return_val_if_fail (stfe->sheet_list != NULL, FALSE);
g_object_get (G_OBJECT (stfe), "sink", &sink, NULL);
g_return_val_if_fail (sink != NULL, FALSE);
@@ -668,7 +668,7 @@ gnm_stf_file_saver_save (G_GNUC_UNUSED GOFileSaver const *fs, GOIOContext *conte
/* TODO: move this GUI dependent code out of this
* filesaver into gui-file.c. After this, remove includes (see above). */
- if (IS_WBC_GTK (context->impl)) {
+ if (GNM_IS_WBC_GTK (context->impl)) {
gboolean cancelled =
stf_export_dialog (WBC_GTK (context->impl), stfe, wb);
if (cancelled) {
diff --git a/src/stf-export.h b/src/stf-export.h
index 921ec82..92a3bcc 100644
--- a/src/stf-export.h
+++ b/src/stf-export.h
@@ -10,7 +10,7 @@ G_BEGIN_DECLS
#define GNM_STF_EXPORT_TYPE (gnm_stf_export_get_type ())
#define GNM_STF_EXPORT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_STF_EXPORT_TYPE, GnmStfExport))
-#define IS_GNM_STF_EXPORT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_STF_EXPORT_TYPE))
+#define GNM_IS_STF_EXPORT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_STF_EXPORT_TYPE))
typedef enum {
GNM_STF_TRANSLITERATE_MODE_TRANS, /* Automatically quote where needed */
diff --git a/src/stf.c b/src/stf.c
index dddbf39..98570d2 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -68,7 +68,7 @@ stf_warning (GOIOContext *context, char const *msg)
* successfully imported portion. We ought to have a
* way to issue a warning.
*/
- if (IS_WBC_GTK (context->impl))
+ if (GNM_IS_WBC_GTK (context->impl))
go_gtk_notice_dialog
(wbcg_toplevel (WBC_GTK (context->impl)),
GTK_MESSAGE_WARNING,
@@ -225,7 +225,7 @@ stf_read_workbook (G_GNUC_UNUSED GOFileOpener const *fo, gchar const *enc,
size_t data_len;
WorkbookView *wbv = WORKBOOK_VIEW (view);
- if (!IS_WBC_GTK (context->impl)) {
+ if (!GNM_IS_WBC_GTK (context->impl)) {
go_io_error_string (context, _("This importer can only be used with a GUI."));
return;
}
@@ -330,7 +330,7 @@ stf_text_to_columns (WorkbookControl *wbc, GOCmdContext *cc)
}
/* FIXME : how to do this cleanly ? */
- if (!IS_WBC_GTK (wbc))
+ if (!GNM_IS_WBC_GTK (wbc))
return;
#warning Add UI for this
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index deb6b5a..f8d1575 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -102,13 +102,13 @@ static GNM_ACTION_DEF (cb_file_new)
}
static GNM_ACTION_DEF (cb_file_open) { gui_file_open (wbcg, GNM_FILE_OPEN_STYLE_OPEN, NULL); }
-static GNM_ACTION_DEF (cb_file_save) { gui_file_save (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg))); }
+static GNM_ACTION_DEF (cb_file_save) { gui_file_save (wbcg, wb_control_view (GNM_WBC (wbcg))); }
static GNM_ACTION_DEF (cb_file_save_as) { gui_file_save_as
- (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)),
+ (wbcg, wb_control_view (GNM_WBC (wbcg)),
GNM_FILE_SAVE_AS_STYLE_SAVE, NULL); }
static GNM_ACTION_DEF (cb_file_sendto) {
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookView *wbv = wb_control_view (wbc);
GOCmdContext *gcc = GO_CMD_CONTEXT (wbcg);
gboolean problem = FALSE;
@@ -200,7 +200,7 @@ static GNM_ACTION_DEF (cb_file_page_setup)
static GNM_ACTION_DEF (cb_file_print_area_set)
{
Sheet *sheet = wbcg_cur_sheet (wbcg);
- SheetView *sv = sheet_get_view (sheet, wb_control_view (WORKBOOK_CONTROL (wbcg)));
+ SheetView *sv = sheet_get_view (sheet, wb_control_view (GNM_WBC (wbcg)));
GnmParsePos pp;
char *message;
char * selection;
@@ -210,7 +210,7 @@ static GNM_ACTION_DEF (cb_file_print_area_set)
parse_pos_init_sheet (&pp, sheet);
selection = undo_range_name (sheet, r);
message = g_strdup_printf (_("Set Print Area to %s"), selection);
- cmd_define_name (WORKBOOK_CONTROL (wbcg), "Print_Area", &pp,
+ cmd_define_name (GNM_WBC (wbcg), "Print_Area", &pp,
gnm_expr_top_new_constant
(value_new_cellrange_r (NULL, r)),
message);
@@ -225,7 +225,7 @@ static GNM_ACTION_DEF (cb_file_print_area_clear)
Sheet *sheet = wbcg_cur_sheet (wbcg);
parse_pos_init_sheet (&pp, sheet);
- cmd_define_name (WORKBOOK_CONTROL (wbcg), "Print_Area", &pp,
+ cmd_define_name (GNM_WBC (wbcg), "Print_Area", &pp,
gnm_expr_top_new_constant
(value_new_error_REF (NULL)),
_("Clear Print Area"));
@@ -238,8 +238,8 @@ static GNM_ACTION_DEF (cb_file_print_area_show)
if (r != NULL) {
SheetView *sv = sheet_get_view (sheet,
- wb_control_view (WORKBOOK_CONTROL (wbcg)));
- wb_control_sheet_focus (WORKBOOK_CONTROL (wbcg), sheet);
+ wb_control_view (GNM_WBC (wbcg)));
+ 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);
@@ -249,31 +249,31 @@ static GNM_ACTION_DEF (cb_file_print_area_show)
static GNM_ACTION_DEF (cb_file_print_area_toggle_col)
{
- cmd_page_break_toggle (WORKBOOK_CONTROL (wbcg),
+ cmd_page_break_toggle (GNM_WBC (wbcg),
wbcg_cur_sheet (wbcg),
TRUE);
}
static GNM_ACTION_DEF (cb_file_print_area_toggle_row)
{
- cmd_page_break_toggle (WORKBOOK_CONTROL (wbcg),
+ cmd_page_break_toggle (GNM_WBC (wbcg),
wbcg_cur_sheet (wbcg),
FALSE);
}
static GNM_ACTION_DEF (cb_file_print_area_clear_pagebreaks)
{
- cmd_page_breaks_clear (WORKBOOK_CONTROL (wbcg), wbcg_cur_sheet (wbcg));
+ cmd_page_breaks_clear (GNM_WBC (wbcg), wbcg_cur_sheet (wbcg));
}
static GNM_ACTION_DEF (cb_file_print)
{
- gnm_print_sheet (WORKBOOK_CONTROL (wbcg),
+ gnm_print_sheet (GNM_WBC (wbcg),
wbcg_cur_sheet (wbcg), FALSE, GNM_PRINT_SAVED_INFO, NULL);
}
static GNM_ACTION_DEF (cb_file_print_preview)
{
- gnm_print_sheet (WORKBOOK_CONTROL (wbcg),
+ gnm_print_sheet (GNM_WBC (wbcg),
wbcg_cur_sheet (wbcg), TRUE, GNM_PRINT_ACTIVE_SHEET, NULL);
}
@@ -300,32 +300,32 @@ static GNM_ACTION_DEF (cb_file_quit)
static GNM_ACTION_DEF (cb_edit_clear_all)
{
- cmd_selection_clear (WORKBOOK_CONTROL (wbcg),
+ cmd_selection_clear (GNM_WBC (wbcg),
CLEAR_VALUES | CLEAR_FORMATS | CLEAR_OBJECTS | CLEAR_COMMENTS);
}
static GNM_ACTION_DEF (cb_edit_clear_formats)
- { cmd_selection_clear (WORKBOOK_CONTROL (wbcg), CLEAR_FORMATS); }
+ { cmd_selection_clear (GNM_WBC (wbcg), CLEAR_FORMATS); }
static GNM_ACTION_DEF (cb_edit_clear_comments)
- { cmd_selection_clear (WORKBOOK_CONTROL (wbcg), CLEAR_COMMENTS); }
+ { cmd_selection_clear (GNM_WBC (wbcg), CLEAR_COMMENTS); }
static GNM_ACTION_DEF (cb_edit_clear_content)
- { cmd_selection_clear (WORKBOOK_CONTROL (wbcg), CLEAR_VALUES); }
+ { cmd_selection_clear (GNM_WBC (wbcg), CLEAR_VALUES); }
static GNM_ACTION_DEF (cb_edit_clear_all_filtered)
{
- cmd_selection_clear (WORKBOOK_CONTROL (wbcg),
+ cmd_selection_clear (GNM_WBC (wbcg),
CLEAR_VALUES | CLEAR_FORMATS | CLEAR_OBJECTS | CLEAR_COMMENTS | CLEAR_FILTERED_ONLY);
}
static GNM_ACTION_DEF (cb_edit_clear_formats_filtered)
- { cmd_selection_clear (WORKBOOK_CONTROL (wbcg), CLEAR_FORMATS | CLEAR_FILTERED_ONLY); }
+ { cmd_selection_clear (GNM_WBC (wbcg), CLEAR_FORMATS | CLEAR_FILTERED_ONLY); }
static GNM_ACTION_DEF (cb_edit_clear_comments_filtered)
- { cmd_selection_clear (WORKBOOK_CONTROL (wbcg), CLEAR_COMMENTS | CLEAR_FILTERED_ONLY); }
+ { cmd_selection_clear (GNM_WBC (wbcg), CLEAR_COMMENTS | CLEAR_FILTERED_ONLY); }
static GNM_ACTION_DEF (cb_edit_clear_content_filtered)
- { cmd_selection_clear (WORKBOOK_CONTROL (wbcg), CLEAR_VALUES | CLEAR_FILTERED_ONLY); }
+ { cmd_selection_clear (GNM_WBC (wbcg), CLEAR_VALUES | CLEAR_FILTERED_ONLY); }
static GNM_ACTION_DEF (cb_edit_delete_rows)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
Sheet *sheet = wb_control_cur_sheet (wbc);
GnmRange const *sel;
@@ -339,7 +339,7 @@ static GNM_ACTION_DEF (cb_edit_delete_rows)
}
static GNM_ACTION_DEF (cb_edit_delete_columns)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
Sheet *sheet = wb_control_cur_sheet (wbc);
GnmRange const *sel;
@@ -364,7 +364,7 @@ static GNM_ACTION_DEF (cb_edit_delete_links)
int n_links = 0;
gchar const *format;
gchar *name;
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
for (l = scg_view (scg)->selections; l != NULL; l = l->next) {
@@ -388,23 +388,23 @@ static GNM_ACTION_DEF (cb_edit_select_all)
}
static GNM_ACTION_DEF (cb_edit_select_row)
{
- sv_select_cur_row (wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg)));
+ sv_select_cur_row (wb_control_cur_sheet_view (GNM_WBC (wbcg)));
}
static GNM_ACTION_DEF (cb_edit_select_col)
{
- sv_select_cur_col (wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg)));
+ sv_select_cur_col (wb_control_cur_sheet_view (GNM_WBC (wbcg)));
}
static GNM_ACTION_DEF (cb_edit_select_array)
{
- sv_select_cur_array (wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg)));
+ sv_select_cur_array (wb_control_cur_sheet_view (GNM_WBC (wbcg)));
}
static GNM_ACTION_DEF (cb_edit_select_depends)
{
- sv_select_cur_depends (wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg)));
+ sv_select_cur_depends (wb_control_cur_sheet_view (GNM_WBC (wbcg)));
}
static GNM_ACTION_DEF (cb_edit_select_inputs)
{
- sv_select_cur_inputs (wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg)));
+ sv_select_cur_inputs (wb_control_cur_sheet_view (GNM_WBC (wbcg)));
}
static GNM_ACTION_DEF (cb_edit_select_object)
{
@@ -415,7 +415,7 @@ static GNM_ACTION_DEF (cb_edit_cut)
{
if (!wbcg_is_editing (wbcg)) {
SheetControlGUI *scg = wbcg_cur_scg (wbcg);
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
if (scg != NULL && scg->selected_objects != NULL)
gnm_app_clipboard_cut_copy_obj (wbc, TRUE, sv,
@@ -430,7 +430,7 @@ static GNM_ACTION_DEF (cb_edit_copy)
{
if (!wbcg_is_editing (wbcg)) {
SheetControlGUI *scg = wbcg_cur_scg (wbcg);
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
if (scg != NULL && scg->selected_objects != NULL)
gnm_app_clipboard_cut_copy_obj (wbc, FALSE, sv,
@@ -444,7 +444,7 @@ static GNM_ACTION_DEF (cb_edit_copy)
static GNM_ACTION_DEF (cb_edit_paste)
{
if (!wbcg_is_editing (wbcg)) {
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
cmd_paste_to_selection (wbc, sv, PASTE_DEFAULT);
} else
@@ -472,7 +472,7 @@ common_cell_goto (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
if (!sheet_is_visible (sheet))
return;
- wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ wbv = wb_control_view (GNM_WBC (wbcg));
sv = sheet_get_view (sheet, wbv);
wb_view_sheet_focus (wbv, sheet);
sv_selection_set (sv, pos,
@@ -559,7 +559,7 @@ static gboolean
cb_edit_search_replace_action (WBCGtk *wbcg,
GnmSearchReplace *sr)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
sr->query_func = cb_edit_search_replace_query;
sr->user_data = wbcg;
@@ -573,7 +573,7 @@ static GNM_ACTION_DEF (cb_edit_search) { dialog_search (wbcg); }
static GNM_ACTION_DEF (cb_edit_fill_autofill)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
Sheet *sheet = wb_control_cur_sheet (wbc);
@@ -626,19 +626,19 @@ static GNM_ACTION_DEF (cb_edit_fill_series)
static GNM_ACTION_DEF (cb_edit_goto_top)
{
- wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_top);
+ wb_control_navigate_to_cell (GNM_WBC (wbcg), navigator_top);
}
static GNM_ACTION_DEF (cb_edit_goto_bottom)
{
- wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_bottom);
+ wb_control_navigate_to_cell (GNM_WBC (wbcg), navigator_bottom);
}
static GNM_ACTION_DEF (cb_edit_goto_first)
{
- wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_first);
+ wb_control_navigate_to_cell (GNM_WBC (wbcg), navigator_first);
}
static GNM_ACTION_DEF (cb_edit_goto_last)
{
- wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_last);
+ wb_control_navigate_to_cell (GNM_WBC (wbcg), navigator_last);
}
static GNM_ACTION_DEF (cb_edit_goto)
{
@@ -646,7 +646,7 @@ static GNM_ACTION_DEF (cb_edit_goto)
}
static GNM_ACTION_DEF (cb_edit_goto_cell_indicator)
{
- if (IS_WBC_GTK (wbcg))
+ if (GNM_IS_WBC_GTK (wbcg))
wbcg_focus_current_cell_indicator (WBC_GTK (wbcg));
}
@@ -658,40 +658,40 @@ static GNM_ACTION_DEF (cb_edit_recalc)
* ctrl-alt-f9 - force a full recalc across all sheets
* ctrl-alt-shift-f9 - a full-monty super recalc
*/
- workbook_recalc_all (wb_control_get_workbook (WORKBOOK_CONTROL (wbcg)));
+ workbook_recalc_all (wb_control_get_workbook (GNM_WBC (wbcg)));
}
-static GNM_ACTION_DEF (cb_repeat) { command_repeat (WORKBOOK_CONTROL (wbcg)); }
+static GNM_ACTION_DEF (cb_repeat) { command_repeat (GNM_WBC (wbcg)); }
/****************************************************************************/
static GNM_ACTION_DEF (cb_direction)
{
- Sheet *sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (wbcg));
- cmd_toggle_rtl (WORKBOOK_CONTROL (wbcg), sheet);
+ Sheet *sheet = wb_control_cur_sheet (GNM_WBC (wbcg));
+ cmd_toggle_rtl (GNM_WBC (wbcg), sheet);
}
static GNM_ACTION_DEF (cb_view_zoom_in)
{
- Sheet *sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (wbcg));
+ Sheet *sheet = wb_control_cur_sheet (GNM_WBC (wbcg));
int zoom = (int)(sheet->last_zoom_factor_used * 100. + .5) - 10;
if ((zoom % 15) != 0)
zoom = 15 * (int)(zoom/15);
zoom += 15;
if (zoom <= 390)
- cmd_zoom (WORKBOOK_CONTROL (wbcg), g_slist_append (NULL, sheet),
+ cmd_zoom (GNM_WBC (wbcg), g_slist_append (NULL, sheet),
(double) (zoom + 10) / 100);
}
static GNM_ACTION_DEF (cb_view_zoom_out)
{
- Sheet *sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (wbcg));
+ Sheet *sheet = wb_control_cur_sheet (GNM_WBC (wbcg));
int zoom = (int)(sheet->last_zoom_factor_used * 100. + .5) - 10;
if ((zoom % 15) != 0)
zoom = 15 * (int)(zoom/15);
else
zoom -= 15;
if (0 <= zoom)
- cmd_zoom (WORKBOOK_CONTROL (wbcg), g_slist_append (NULL, sheet),
+ cmd_zoom (GNM_WBC (wbcg), g_slist_append (NULL, sheet),
(double) (zoom + 10) / 100);
}
@@ -707,7 +707,7 @@ static GNM_ACTION_DEF (cb_view_zoom) { dialog_zoom (wbcg, wbcg_cur_sheet (wbcg))
static GNM_ACTION_DEF (cb_view_new) { dialog_new_view (wbcg); }
static GNM_ACTION_DEF (cb_view_freeze_panes)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
SheetControlGUI *scg = wbcg_cur_scg (wbcg);
@@ -776,7 +776,7 @@ static void
insert_date_time_common (WBCGtk *wbcg, gboolean do_date, gboolean do_time)
{
if (wbcg_edit_start (wbcg, FALSE, FALSE)) {
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
Sheet *sheet = sv_sheet (sv);
GnmCell const *cell = sheet_cell_fetch (sheet,
@@ -844,7 +844,7 @@ static GNM_ACTION_DEF (cb_paste_names)
static GNM_ACTION_DEF (cb_insert_rows)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
SheetView *sv = wb_control_cur_sheet_view (wbc);
GnmRange const *sel;
@@ -860,7 +860,7 @@ static GNM_ACTION_DEF (cb_insert_rows)
static GNM_ACTION_DEF (cb_insert_cols)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
SheetView *sv = wb_control_cur_sheet_view (wbc);
GnmRange const *sel;
@@ -879,7 +879,7 @@ static GNM_ACTION_DEF (cb_insert_cells) { dialog_insert_cells (wbcg); }
static GNM_ACTION_DEF (cb_insert_comment)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
SheetView *sv = wb_control_cur_sheet_view (wbc);
dialog_cell_comment (wbcg, sheet, &sv->edit_pos);
@@ -889,7 +889,7 @@ static GNM_ACTION_DEF (cb_insert_comment)
static GNM_ACTION_DEF (cb_sheet_name)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
dialog_sheet_rename (wbcg, sheet);
}
@@ -950,32 +950,32 @@ static GNM_ACTION_DEF (cb_data_import_text) { gui_file_open
static GNM_ACTION_DEF (cb_data_import_other) { gui_file_open
(wbcg, GNM_FILE_OPEN_STYLE_IMPORT, NULL); }
-static GNM_ACTION_DEF (cb_auto_filter) { cmd_autofilter_add_remove (WORKBOOK_CONTROL (wbcg)); }
-static GNM_ACTION_DEF (cb_show_all) { filter_show_all (WORKBOOK_CONTROL (wbcg)); }
+static GNM_ACTION_DEF (cb_auto_filter) { cmd_autofilter_add_remove (GNM_WBC (wbcg)); }
+static GNM_ACTION_DEF (cb_show_all) { filter_show_all (GNM_WBC (wbcg)); }
static GNM_ACTION_DEF (cb_data_filter) { dialog_advanced_filter (wbcg); }
static GNM_ACTION_DEF (cb_data_validate) { dialog_cell_format (wbcg, FD_VALIDATION,
(1 << FD_VALIDATION) | (1 <<
FD_INPUT_MSG)); }
-static GNM_ACTION_DEF (cb_data_text_to_columns) { stf_text_to_columns (WORKBOOK_CONTROL (wbcg),
GO_CMD_CONTEXT (wbcg)); }
+static GNM_ACTION_DEF (cb_data_text_to_columns) { stf_text_to_columns (GNM_WBC (wbcg), GO_CMD_CONTEXT
(wbcg)); }
static GNM_ACTION_DEF (cb_data_consolidate) { dialog_consolidate (wbcg); }
static GNM_ACTION_DEF (cb_data_table) { dialog_data_table (wbcg); }
static GNM_ACTION_DEF (cb_data_slicer_create) { dialog_data_slicer (wbcg, TRUE); }
-static GNM_ACTION_DEF (cb_data_slicer_refresh) { cmd_slicer_refresh (WORKBOOK_CONTROL (wbcg)); }
+static GNM_ACTION_DEF (cb_data_slicer_refresh) { cmd_slicer_refresh (GNM_WBC (wbcg)); }
static GNM_ACTION_DEF (cb_data_slicer_edit) { dialog_data_slicer (wbcg, FALSE); }
static GNM_ACTION_DEF (cb_data_export) { gui_file_save_as
- (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)),
+ (wbcg, wb_control_view (GNM_WBC (wbcg)),
GNM_FILE_SAVE_AS_STYLE_EXPORT, NULL); }
static GNM_ACTION_DEF (cb_data_export_text) { gui_file_save_as
- (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)),
+ (wbcg, wb_control_view (GNM_WBC (wbcg)),
GNM_FILE_SAVE_AS_STYLE_EXPORT, "Gnumeric_stf:stf_assistant"); }
static GNM_ACTION_DEF (cb_data_export_csv) { gui_file_save_as
- (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)),
+ (wbcg, wb_control_view (GNM_WBC (wbcg)),
GNM_FILE_SAVE_AS_STYLE_EXPORT, "Gnumeric_stf:stf_csv"); }
static GNM_ACTION_DEF (cb_data_export_repeat) { gui_file_export_repeat (wbcg); }
static void
hide_show_detail_real (WBCGtk *wbcg, gboolean is_cols, gboolean show)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
char const *operation = show ? _("Show Detail") : _("Hide Detail");
GnmRange const *r = selection_first_range (sv, GO_CMD_CONTEXT (wbc),
@@ -994,7 +994,7 @@ hide_show_detail_real (WBCGtk *wbcg, gboolean is_cols, gboolean show)
static void
hide_show_detail (WBCGtk *wbcg, gboolean show)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
Sheet const *sheet = sv_sheet (sv);
char const *operation = show ? _("Show Detail") : _("Hide Detail");
@@ -1022,7 +1022,7 @@ hide_show_detail (WBCGtk *wbcg, gboolean show)
static void
group_ungroup_colrow (WBCGtk *wbcg, gboolean group)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
SheetView *sv = wb_control_cur_sheet_view (wbc);
Sheet const *sheet = sv_sheet (sv);
char const *operation = group ? _("Group") : _("Ungroup");
@@ -1172,8 +1172,8 @@ static GNM_ACTION_DEF (cb_insert_image)
static GNM_ACTION_DEF (cb_insert_hyperlink) { dialog_hyperlink (wbcg, SHEET_CONTROL (wbcg_cur_scg
(wbcg))); }
static GNM_ACTION_DEF (cb_formula_guru) { dialog_formula_guru (wbcg, NULL); }
-static GNM_ACTION_DEF (cb_insert_sort_ascending) { workbook_cmd_wrap_sort (WORKBOOK_CONTROL (wbcg), 1);}
-static GNM_ACTION_DEF (cb_insert_sort_descending){ workbook_cmd_wrap_sort (WORKBOOK_CONTROL (wbcg), 0);}
+static GNM_ACTION_DEF (cb_insert_sort_ascending) { workbook_cmd_wrap_sort (GNM_WBC (wbcg), 1);}
+static GNM_ACTION_DEF (cb_insert_sort_descending){ workbook_cmd_wrap_sort (GNM_WBC (wbcg), 0);}
static void
sort_by_rows (WBCGtk *wbcg, gboolean descending)
@@ -1189,9 +1189,9 @@ sort_by_rows (WBCGtk *wbcg, gboolean descending)
gboolean top_to_bottom = TRUE;
gboolean not_acceptable = FALSE;
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
- sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
for (l = sv->selections; l != NULL; l = l->next) {
GnmRange const *r = l->data;
if (range_is_singleton (r)) {
@@ -1316,7 +1316,7 @@ sort_by_rows (WBCGtk *wbcg, gboolean descending)
if (sheet_range_has_heading (data->sheet, data->range, data->top, FALSE))
data->range->start.row += 1;
- cmd_sort (WORKBOOK_CONTROL (wbcg), data);
+ cmd_sort (GNM_WBC (wbcg), data);
}
static GNM_ACTION_DEF (cb_sort_ascending) { sort_by_rows (wbcg, FALSE); }
static GNM_ACTION_DEF (cb_sort_descending) { sort_by_rows (wbcg, TRUE); }
@@ -1327,7 +1327,7 @@ cb_add_graph (GogGraph *graph, gpointer wbcg)
GnmGraphDataClosure *data = (GnmGraphDataClosure *) g_object_get_data (G_OBJECT (graph),
"data-closure");
if (data) {
if (data->new_sheet) {
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
WorkbookSheetState *old_state = workbook_sheet_state_new (wb_control_get_workbook
(wbc));
Sheet *new_sheet = workbook_sheet_add_with_type (
@@ -1457,7 +1457,7 @@ static GNM_ACTION_DEF (cmd_create_ellipse)
static void
wbcg_set_selection_halign (WBCGtk *wbcg, GnmHAlign halign)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookView *wb_view;
GnmStyle *style;
@@ -1488,7 +1488,7 @@ static GNM_ACTION_DEF (cb_center_across_selection)
static void
wbcg_set_selection_valign (WBCGtk *wbcg, GnmVAlign valign)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookView *wb_view;
GnmStyle *style;
@@ -1519,7 +1519,7 @@ static GNM_ACTION_DEF (cb_align_bottom)
static GNM_ACTION_DEF (cb_merge_and_center)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GSList *range_list = selection_get_ranges (
wb_control_cur_sheet_view (wbc), FALSE);
cmd_merge_cells (wbc, wb_control_cur_sheet (wbc), range_list, TRUE);
@@ -1528,7 +1528,7 @@ static GNM_ACTION_DEF (cb_merge_and_center)
static GNM_ACTION_DEF (cb_merge_cells)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GSList *range_list = selection_get_ranges (
wb_control_cur_sheet_view (wbc), FALSE);
cmd_merge_cells (wbc, wb_control_cur_sheet (wbc), range_list, FALSE);
@@ -1537,7 +1537,7 @@ static GNM_ACTION_DEF (cb_merge_cells)
static GNM_ACTION_DEF (cb_unmerge_cells)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GSList *range_list = selection_get_ranges (
wb_control_cur_sheet_view (wbc), FALSE);
cmd_unmerge_cells (wbc, wb_control_cur_sheet (wbc), range_list);
@@ -1555,7 +1555,7 @@ static void
toggle_font_attr (WBCGtk *wbcg, GtkToggleAction *act,
GnmStyleElement t, unsigned true_val, unsigned false_val)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GnmStyle *new_style;
unsigned val;
@@ -1644,7 +1644,7 @@ apply_number_format (WBCGtk *wbcg,
{
GnmStyle *mstyle = gnm_style_new ();
gnm_style_set_format (mstyle, format);
- cmd_selection_format (WORKBOOK_CONTROL (wbcg), mstyle, NULL, descriptor);
+ cmd_selection_format (GNM_WBC (wbcg), mstyle, NULL, descriptor);
}
static GNM_ACTION_DEF (cb_format_as_general)
@@ -1733,7 +1733,7 @@ mutate_borders (WBCGtk *wbcg, gboolean add)
else
borders[i] = NULL;
- cmd_selection_format (WORKBOOK_CONTROL (wbcg), NULL, borders,
+ cmd_selection_format (GNM_WBC (wbcg), NULL, borders,
add ? _("Add Borders") : _("Remove borders"));
}
@@ -1745,7 +1745,7 @@ modify_format (WBCGtk *wbcg,
GOFormat *(*format_modify_fn) (GOFormat const *format),
char const *descriptor)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookView const *wbv;
GOFormat *new_fmt;
@@ -1804,7 +1804,7 @@ inc_dec (WBCGtk *wbcg,
GOFormat *(*format_modify_fn) (GOFormat const *format),
char const *descriptor)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookView *wbv = wb_control_view (wbc);
GOFormat const *fmt = gnm_style_get_format (wbv->current_style);
SheetView *sv;
@@ -1857,18 +1857,18 @@ static GNM_ACTION_DEF (cb_format_dec_precision)
static GNM_ACTION_DEF (cb_format_with_thousands)
{ modify_format (wbcg, &go_format_toggle_1000sep, _("Toggle thousands separator")); }
-static GNM_ACTION_DEF (cb_format_dec_indent) { workbook_cmd_dec_indent (WORKBOOK_CONTROL (wbcg)); }
-static GNM_ACTION_DEF (cb_format_inc_indent) { workbook_cmd_inc_indent (WORKBOOK_CONTROL (wbcg)); }
+static GNM_ACTION_DEF (cb_format_dec_indent) { workbook_cmd_dec_indent (GNM_WBC (wbcg)); }
+static GNM_ACTION_DEF (cb_format_inc_indent) { workbook_cmd_inc_indent (GNM_WBC (wbcg)); }
static GNM_ACTION_DEF (cb_copydown)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
cmd_copyrel (wbc, 0, -1, _("Copy down"));
}
static GNM_ACTION_DEF (cb_copyright)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
/* xgettext: copy from the cell to the left into current cell --
this has nothing whatsoever to do with copyright. */
cmd_copyrel (wbc, -1, 0, _("Copy right"));
@@ -1876,21 +1876,21 @@ static GNM_ACTION_DEF (cb_copyright)
static GNM_ACTION_DEF (cb_format_cells_auto_fit_height)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
workbook_cmd_autofit_selection
(wbc, wb_control_cur_sheet (wbc), FALSE);
}
static GNM_ACTION_DEF (cb_format_cells_auto_fit_width)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
workbook_cmd_autofit_selection
(wbc, wb_control_cur_sheet (wbc), TRUE);
}
static GNM_ACTION_DEF (cb_format_column_auto_fit)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
workbook_cmd_resize_selected_colrow (wbc,
wb_control_cur_sheet (wbc), TRUE, -1);
}
@@ -1904,16 +1904,16 @@ static GNM_ACTION_DEF (cb_format_column_std_width)
}
static GNM_ACTION_DEF (cb_format_column_hide)
{
- cmd_selection_colrow_hide (WORKBOOK_CONTROL (wbcg), TRUE, FALSE);
+ cmd_selection_colrow_hide (GNM_WBC (wbcg), TRUE, FALSE);
}
static GNM_ACTION_DEF (cb_format_column_unhide)
{
- cmd_selection_colrow_hide (WORKBOOK_CONTROL (wbcg), TRUE, TRUE);
+ cmd_selection_colrow_hide (GNM_WBC (wbcg), TRUE, TRUE);
}
static GNM_ACTION_DEF (cb_format_row_auto_fit)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
workbook_cmd_resize_selected_colrow (wbc,
wb_control_cur_sheet (wbc), FALSE, -1);
}
@@ -1927,11 +1927,11 @@ static GNM_ACTION_DEF (cb_format_row_std_height)
}
static GNM_ACTION_DEF (cb_format_row_hide)
{
- cmd_selection_colrow_hide (WORKBOOK_CONTROL (wbcg), FALSE, FALSE);
+ cmd_selection_colrow_hide (GNM_WBC (wbcg), FALSE, FALSE);
}
static GNM_ACTION_DEF (cb_format_row_unhide)
{
- cmd_selection_colrow_hide (WORKBOOK_CONTROL (wbcg), FALSE, TRUE);
+ cmd_selection_colrow_hide (GNM_WBC (wbcg), FALSE, TRUE);
}
static GNM_ACTION_DEF (cb_file_menu)
@@ -2781,7 +2781,7 @@ static GtkActionEntry const actions[] = {
#define TOGGLE_HANDLER(flag,property) \
static GNM_ACTION_DEF (cb_sheet_pref_ ## flag ) \
{ \
- g_return_if_fail (IS_WBC_GTK (wbcg)); \
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg)); \
\
if (!wbcg->updating_ui) { \
Sheet *sheet = wbcg_cur_sheet (wbcg); \
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 7d6957b..ed5b9b0 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -99,9 +99,9 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
WorkbookControl *wbc;
WorkbookView *wbv;
- g_return_val_if_fail (IS_WBC_GTK (wbcg), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), FALSE);
- wbc = WORKBOOK_CONTROL (wbcg);
+ wbc = GNM_WBC (wbcg);
wbv = wb_control_view (wbc);
wbcg_focus_cur_scg (wbcg);
@@ -296,7 +296,7 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
gtk_editable_set_position (
GTK_EDITABLE (wbcg_get_entry (wbcg)), -1);
- reedit = wb_control_validation_msg (WORKBOOK_CONTROL (wbcg),
+ reedit = wb_control_validation_msg (GNM_WBC (wbcg),
GNM_VALIDATION_STYLE_PARSE_ERROR, NULL,
perr.err->message);
if (showed_dialog != NULL)
@@ -533,7 +533,7 @@ cb_entry_changed (G_GNUC_UNUSED GtkEntry *entry, WBCGtk *wbcg)
{
char const *text;
int text_len;
- WorkbookView *wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wbv = wb_control_view (GNM_WBC (wbcg));
text = gtk_entry_get_text (wbcg_get_entry (wbcg));
text_len = strlen (text);
@@ -668,7 +668,7 @@ cb_entry_cursor_pos (WBCGtk *wbcg)
gnm_style_set_from_pango_attribute (style, attr);
pango_attribute_destroy (attr);
}
- wb_control_style_feedback (WORKBOOK_CONTROL (wbcg), style);
+ wb_control_style_feedback (GNM_WBC (wbcg), style);
gnm_style_unref (style);
g_slist_free (attrs);
}
@@ -714,7 +714,7 @@ wbcg_edit_init_markup (WBCGtk *wbcg, PangoAttrList *markup)
wbcg->edit_line.markup = markup;
- sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
style = sheet_style_get (sv->sheet, sv->edit_pos.col, sv->edit_pos.row);
wbcg->edit_line.cell_attrs = gnm_style_generate_attrs_full (style);
@@ -843,7 +843,7 @@ wbcg_edit_start (WBCGtk *wbcg,
WorkbookView *wbv;
int cursor_pos = -1;
- g_return_val_if_fail (IS_WBC_GTK (wbcg), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), FALSE);
if (wbcg_is_editing (wbcg))
return TRUE;
@@ -853,8 +853,8 @@ wbcg_edit_start (WBCGtk *wbcg,
return TRUE;
wbcg->inside_editing = TRUE;
- wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
- sv = wb_control_cur_sheet_view (WORKBOOK_CONTROL (wbcg));
+ wbv = wb_control_view (GNM_WBC (wbcg));
+ sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
scg = wbcg_cur_scg (wbcg);
col = sv->edit_pos.col;
@@ -915,7 +915,7 @@ wbcg_edit_start (WBCGtk *wbcg,
case GNM_RESPONSE_REMOVE: {
GnmStyle *style = gnm_style_new ();
gnm_style_set_format (style, go_format_general ());
- if (!cmd_selection_format (WORKBOOK_CONTROL (wbcg),
+ if (!cmd_selection_format (GNM_WBC (wbcg),
style, NULL, NULL))
break;
/* Fall through. */
@@ -1008,7 +1008,7 @@ wbcg_edit_start (WBCGtk *wbcg,
G_CALLBACK (cb_entry_cursor_pos), wbcg);
g_free (text);
- wb_control_update_action_sensitivity (WORKBOOK_CONTROL (wbcg));
+ wb_control_update_action_sensitivity (GNM_WBC (wbcg));
wbcg->inside_editing = FALSE;
@@ -1033,7 +1033,7 @@ wbcg_insert_object (WBCGtk *wbcg, SheetObject *so)
int i, npages;
SheetControlGUI *scg;
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
g_return_if_fail (GNM_IS_SO (so));
wbcg_insert_object_clear (wbcg);
@@ -1051,7 +1051,7 @@ wbcg_insert_object (WBCGtk *wbcg, SheetObject *so)
* selected object, the new object will be destroyed by the loop
* above. See #669648. */
wbcg->new_object = so;
- wb_control_update_action_sensitivity (WORKBOOK_CONTROL (wbcg));
+ wb_control_update_action_sensitivity (GNM_WBC (wbcg));
}
/**
@@ -1065,7 +1065,7 @@ wbcg_insert_object (WBCGtk *wbcg, SheetObject *so)
void
wbcg_insert_object_clear (WBCGtk *wbcg)
{
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
if (NULL != wbcg->new_object) {
int i, npages;
@@ -1091,7 +1091,7 @@ wbcg_insert_object_clear (WBCGtk *wbcg)
GtkEntry *
wbcg_get_entry (WBCGtk const *wbcg)
{
- g_return_val_if_fail (IS_WBC_GTK (wbcg), NULL);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), NULL);
g_return_val_if_fail (wbcg != NULL, NULL);
return gnm_expr_entry_get_entry (wbcg->edit_line.entry);
@@ -1133,7 +1133,7 @@ wbcg_get_entry_underlying (WBCGtk const *wbcg)
void
wbcg_set_entry (WBCGtk *wbcg, GnmExprEntry *entry)
{
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
if (wbcg->edit_line.temp_entry != entry) {
scg_rangesel_stop (wbcg_cur_scg (wbcg), FALSE);
@@ -1158,10 +1158,10 @@ wbcg_entry_has_logical (WBCGtk const *wbcg)
static void
wbcg_edit_attach_guru_main (WBCGtk *wbcg, GtkWidget *guru)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
g_return_if_fail (guru != NULL);
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
g_return_if_fail (wbcg->edit_line.guru == NULL);
/* Make sure we don't have anything anted.
@@ -1198,7 +1198,7 @@ void
wbc_gtk_attach_guru (WBCGtk *wbcg, GtkWidget *guru)
{
g_return_if_fail (guru != NULL);
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
wbcg_edit_attach_guru_main (wbcg, guru);
g_signal_connect_object (G_OBJECT (guru), "set-focus",
@@ -1210,7 +1210,7 @@ wbc_gtk_attach_guru_with_unfocused_rs (WBCGtk *wbcg, GtkWidget *guru,
GnmExprEntry *gee)
{
g_return_if_fail (guru != NULL);
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
wbcg_edit_attach_guru_main (wbcg, guru);
@@ -1225,9 +1225,9 @@ wbc_gtk_attach_guru_with_unfocused_rs (WBCGtk *wbcg, GtkWidget *guru,
void
wbc_gtk_detach_guru (WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
/* don't sit end 'End' mode when a dialog comes up */
wbcg_set_end_mode (wbcg, FALSE);
@@ -1284,7 +1284,7 @@ wbcg_edit_get_display_text (WBCGtk *wbcg)
void
wbc_gtk_init_editline (WBCGtk *wbcg)
{
- g_assert (IS_WBC_GTK (wbcg));
+ g_assert (GNM_IS_WBC_GTK (wbcg));
g_assert (wbcg->edit_line.entry == NULL);
wbcg->edit_line.entry = g_object_new (GNM_EXPR_ENTRY_TYPE,
diff --git a/src/wbc-gtk-impl.h b/src/wbc-gtk-impl.h
index 2c974de..ee8abd6 100644
--- a/src/wbc-gtk-impl.h
+++ b/src/wbc-gtk-impl.h
@@ -151,7 +151,7 @@ typedef struct {
void (*markup_changed) (WBCGtk const *wbcg);
} WBCGtkClass;
-#define WORKBOOK_CONTROL_GUI_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), WBC_GTK_TYPE, WBCGtkClass))
+#define WORKBOOK_CONTROL_GUI_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNM_WBC_GTK_TYPE, WBCGtkClass))
#define GNM_RESPONSE_SAVE_ALL -1000
#define GNM_RESPONSE_DISCARD_ALL -1001
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index d6a3d06..27b8104 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -105,7 +105,7 @@ static GObjectClass *parent_class = NULL;
static gboolean
wbcg_ui_update_begin (WBCGtk *wbcg)
{
- g_return_val_if_fail (IS_WBC_GTK (wbcg), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), FALSE);
g_return_val_if_fail (!wbcg->updating_ui, FALSE);
return (wbcg->updating_ui = TRUE);
@@ -114,7 +114,7 @@ wbcg_ui_update_begin (WBCGtk *wbcg)
static void
wbcg_ui_update_end (WBCGtk *wbcg)
{
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
g_return_if_fail (wbcg->updating_ui);
wbcg->updating_ui = FALSE;
@@ -260,9 +260,9 @@ cb_autosave (WBCGtk *wbcg)
{
WorkbookView *wb_view;
- g_return_val_if_fail (IS_WBC_GTK (wbcg), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), FALSE);
- wb_view = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ wb_view = wb_control_view (GNM_WBC (wbcg));
if (wb_view == NULL)
return FALSE;
@@ -287,7 +287,7 @@ cb_autosave (WBCGtk *wbcg)
gboolean
wbcg_rangesel_possible (WBCGtk const *wbcg)
{
- g_return_val_if_fail (IS_WBC_GTK (wbcg), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), FALSE);
/* Already range selecting */
if (wbcg->rangesel != NULL)
@@ -303,7 +303,7 @@ wbcg_rangesel_possible (WBCGtk const *wbcg)
gboolean
wbcg_is_editing (WBCGtk const *wbcg)
{
- g_return_val_if_fail (IS_WBC_GTK (wbcg), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), FALSE);
return wbcg->editing;
}
@@ -423,7 +423,7 @@ wbcg_update_action_sensitivity (WorkbookControl *wbc)
void
wbcg_insert_sheet (GtkWidget *unused, WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
Workbook *wb = sheet->workbook;
WorkbookSheetState *old_state = workbook_sheet_state_new (wb);
@@ -437,7 +437,7 @@ wbcg_insert_sheet (GtkWidget *unused, WBCGtk *wbcg)
void
wbcg_append_sheet (GtkWidget *unused, WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
Workbook *wb = sheet->workbook;
WorkbookSheetState *old_state = workbook_sheet_state_new (wb);
@@ -451,7 +451,7 @@ wbcg_append_sheet (GtkWidget *unused, WBCGtk *wbcg)
void
wbcg_clone_sheet (GtkWidget *unused, WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
Workbook *wb = sheet->workbook;
WorkbookSheetState *old_state = workbook_sheet_state_new (wb);
@@ -629,7 +629,7 @@ cb_sheet_label_drag_data_received (GtkWidget *widget, GdkDragContext *context,
SheetControlGUI *scg_src, *scg_dst;
Sheet *s_src, *s_dst;
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
g_return_if_fail (GTK_IS_WIDGET (widget));
w_source = gtk_drag_get_source_widget (context);
@@ -655,7 +655,7 @@ cb_sheet_label_drag_data_received (GtkWidget *widget, GdkDragContext *context,
int p_dst = s_dst->index_in_wb;
WorkbookSheetState *old_state = workbook_sheet_state_new (wb);
workbook_sheet_move (s_src, p_dst - p_src);
- cmd_reorganize_sheets (WORKBOOK_CONTROL (wbcg),
+ cmd_reorganize_sheets (GNM_WBC (wbcg),
old_state,
s_src);
} else {
@@ -675,7 +675,7 @@ cb_sheet_label_drag_begin (GtkWidget *widget, GdkDragContext *context,
{
GtkWidget *arrow, *image;
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
/* Create the arrow. */
arrow = gtk_window_new (GTK_WINDOW_POPUP);
@@ -695,7 +695,7 @@ cb_sheet_label_drag_end (GtkWidget *widget, GdkDragContext *context,
{
GtkWidget *arrow;
- g_return_if_fail (IS_WORKBOOK_CONTROL (wbcg));
+ g_return_if_fail (GNM_IS_WBC (wbcg));
/* Destroy the arrow. */
arrow = g_object_get_data (G_OBJECT (widget), "arrow");
@@ -727,8 +727,8 @@ cb_sheet_label_drag_motion (GtkWidget *widget, GdkDragContext *context,
gint root_x, root_y, pos_x, pos_y;
GtkAllocation wa, wsa;
- g_return_val_if_fail (IS_WBC_GTK (wbcg), FALSE);
- g_return_val_if_fail (IS_WBC_GTK (wbcg), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), FALSE);
/* Make sure we are really hovering over another label. */
w_source = gtk_drag_get_source_widget (context);
@@ -846,7 +846,7 @@ cb_notebook_switch_page (G_GNUC_UNUSED GtkNotebook *notebook_,
Sheet *sheet;
SheetControlGUI *new_scg;
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
/* Ignore events during destruction */
if (wbcg->snotebook == NULL)
@@ -920,7 +920,7 @@ cb_notebook_switch_page (G_GNUC_UNUSED GtkNotebook *notebook_,
wbcg_update_menu_feedback (wbcg, sheet);
sheet_flag_status_update_range (sheet, NULL);
sheet_update (sheet);
- wb_view_sheet_focus (wb_control_view (WORKBOOK_CONTROL (wbcg)), sheet);
+ wb_view_sheet_focus (wb_control_view (GNM_WBC (wbcg)), sheet);
cb_zoom_change (sheet, NULL, wbcg);
}
}
@@ -953,7 +953,7 @@ cb_bnotebook_page_reordered (GtkNotebook *notebook, GtkWidget *child,
g_printerr ("Reordered %d -> %d\n", old, page_num);
if (old != page_num) {
- WorkbookControl * wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl * wbc = GNM_WBC (wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
Sheet *sheet = workbook_sheet_by_index (wb, old);
WorkbookSheetState * old_state = workbook_sheet_state_new(wb);
@@ -1292,7 +1292,7 @@ wbcg_sheet_order_changed (WBCGtk *wbcg)
static void
wbcg_update_title (WBCGtk *wbcg)
{
- GODoc *doc = wb_control_get_doc (WORKBOOK_CONTROL (wbcg));
+ GODoc *doc = wb_control_get_doc (GNM_WBC (wbcg));
char *basename = doc->uri ? go_basename_from_uri (doc->uri) : NULL;
char *title = g_strconcat
(go_doc_is_dirty (doc) ? "*" : "",
@@ -1873,7 +1873,7 @@ wbcg_close_if_user_permits (WBCGtk *wbcg, WorkbookView *wb_view)
gboolean
wbc_gtk_close (WBCGtk *wbcg)
{
- WorkbookView *wb_view = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wb_view = wb_control_view (GNM_WBC (wbcg));
g_return_val_if_fail (IS_WORKBOOK_VIEW (wb_view), TRUE);
g_return_val_if_fail (wb_view->wb_controls != NULL, TRUE);
@@ -1950,7 +1950,7 @@ cb_accept_input_selected_merged (WBCGtk *wbcg)
#warning FIXME: this creates 2 undo items!
if (wbcg_is_editing (wbcg) &&
wbcg_edit_finish (wbcg, WBC_EDIT_ACCEPT, NULL)) {
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookView *wbv = wb_control_view (wbc);
SheetView *sv = sheet_get_view (sheet, wbv);
GnmRange sel = *(selection_first_range (sv, NULL, NULL));
@@ -1972,7 +1972,7 @@ cb_accept_input_selected_merged (WBCGtk *wbcg)
/* cb_accept_input_sheets (WBCGtk *wbcg) */
/* { */
/* GSList *sheets = workbook_sheets */
-/* (wb_control_get_workbook (WORKBOOK_CONTROL (wbcg))); */
+/* (wb_control_get_workbook (GNM_WBC (wbcg))); */
/* GSList *vis_sheets = NULL; */
/* g_slist_foreach (sheets, */
@@ -1996,7 +1996,7 @@ cb_accept_input_selected_merged (WBCGtk *wbcg)
/* cb_accept_input_menu_sensitive_sheets (WBCGtk *wbcg) */
/* { */
/* GSList *sheets = workbook_sheets */
-/* (wb_control_get_workbook (WORKBOOK_CONTROL (wbcg))); */
+/* (wb_control_get_workbook (GNM_WBC (wbcg))); */
/* gint n = 0; */
/* g_slist_foreach (sheets, */
@@ -2010,7 +2010,7 @@ cb_accept_input_selected_merged (WBCGtk *wbcg)
/* cb_accept_input_menu_sensitive_selected_sheets (WBCGtk *wbcg) */
/* { */
/* GSList *sheets = workbook_sheets */
-/* (wb_control_get_workbook (WORKBOOK_CONTROL (wbcg))); */
+/* (wb_control_get_workbook (GNM_WBC (wbcg))); */
/* gint n = 0; */
/* g_slist_foreach (sheets, */
@@ -2023,7 +2023,7 @@ cb_accept_input_selected_merged (WBCGtk *wbcg)
static gboolean
cb_accept_input_menu_sensitive_selected_cells (WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookView *wbv = wb_control_view (wbc);
SheetView *sv = sheet_get_view (wbcg->editing_sheet, wbv);
gboolean result = TRUE;
@@ -2044,7 +2044,7 @@ cb_accept_input_menu_sensitive_selected_cells (WBCGtk *wbcg)
static gboolean
cb_accept_input_menu_sensitive_selected_merged (WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
WorkbookView *wbv = wb_control_view (wbc);
SheetView *sv = sheet_get_view (wbcg->editing_sheet, wbv);
GnmRange const *sel = selection_first_range (sv, NULL, NULL);
@@ -2164,7 +2164,7 @@ cb_editline_focus_in (GtkWidget *w, GdkEventFocus *event,
static void
cb_statusbox_activate (GtkEntry *entry, WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
wb_control_parse_and_jump (wbc, gtk_entry_get_text (entry));
wbcg_focus_cur_scg (wbcg);
wb_view_selection_desc (wb_control_view (wbc), TRUE, wbc);
@@ -2183,7 +2183,7 @@ cb_statusbox_focus (GtkEntry *entry, GdkEventFocus *event,
static void
cb_workbook_debug_info (WBCGtk *wbcg)
{
- Workbook *wb = wb_control_get_workbook (WORKBOOK_CONTROL (wbcg));
+ Workbook *wb = wb_control_get_workbook (GNM_WBC (wbcg));
if (gnm_debug_flag ("deps")) {
dependents_dump (wb);
@@ -2290,7 +2290,7 @@ cb_scroll_wheel (GtkWidget *w, GdkEventScroll *event,
}
if (0 <= zoom && zoom <= 390)
- cmd_zoom (WORKBOOK_CONTROL (wbcg), g_slist_append (NULL, sheet),
+ cmd_zoom (GNM_WBC (wbcg), g_slist_append (NULL, sheet),
(double) (zoom + 10) / 100);
} else if ((event->state & GDK_SHIFT_MASK)) {
/* XL sort of shows/hides groups */
@@ -2416,7 +2416,7 @@ cb_screen_changed (GtkWidget *widget)
void
wbcg_set_status_text (WBCGtk *wbcg, char const *text)
{
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
gtk_statusbar_pop (GTK_STATUSBAR (wbcg->status_text), 0);
gtk_statusbar_push (GTK_STATUSBAR (wbcg->status_text), 0, text);
}
@@ -2462,7 +2462,7 @@ wbcg_copy_toolbar_visibility (WBCGtk *new_wbcg,
void
wbcg_set_end_mode (WBCGtk *wbcg, gboolean flag)
{
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
if (!wbcg->last_key_was_end != !flag) {
const char *txt = flag ? _("END") : "";
@@ -2521,7 +2521,7 @@ static int
show_gui (WBCGtk *wbcg)
{
SheetControlGUI *scg;
- WorkbookView *wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wbv = wb_control_view (GNM_WBC (wbcg));
int sx, sy;
gdouble fx, fy;
GdkRectangle rect;
@@ -2604,7 +2604,7 @@ wbcg_get_label_for_position (WBCGtk *wbcg, GtkWidget *source,
guint n, i;
GtkWidget *last_visible = NULL;
- g_return_val_if_fail (IS_WBC_GTK (wbcg), NULL);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), NULL);
n = wbcg_get_n_scg (wbcg);
for (i = 0; i < n; i++) {
@@ -2637,7 +2637,7 @@ static gboolean
wbcg_is_local_drag (WBCGtk *wbcg, GtkWidget *source_widget)
{
GtkWidget *top = (GtkWidget *)wbcg_toplevel (wbcg);
- return IS_GNM_PANE (source_widget) &&
+ return GNM_IS_PANE (source_widget) &&
gtk_widget_get_toplevel (source_widget) == top;
}
static gboolean
@@ -2666,7 +2666,7 @@ cb_wbcg_drag_leave (GtkWidget *widget, GdkDragContext *context,
{
GtkWidget *source_widget = gtk_drag_get_source_widget (context);
- g_return_if_fail (IS_WBC_GTK (wbcg));
+ g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
if (GNM_IS_NOTEBOOK (gtk_widget_get_parent (source_widget)))
gtk_widget_hide (
@@ -2707,13 +2707,13 @@ cb_wbcg_drag_data_received (GtkWidget *widget, GdkDragContext *context,
}
static void cb_cs_go_up (WBCGtk *wbcg)
-{ wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_top); }
+{ wb_control_navigate_to_cell (GNM_WBC (wbcg), navigator_top); }
static void cb_cs_go_down (WBCGtk *wbcg)
-{ wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_bottom); }
+{ wb_control_navigate_to_cell (GNM_WBC (wbcg), navigator_bottom); }
static void cb_cs_go_left (WBCGtk *wbcg)
-{ wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_first); }
+{ wb_control_navigate_to_cell (GNM_WBC (wbcg), navigator_first); }
static void cb_cs_go_right (WBCGtk *wbcg)
-{ wb_control_navigate_to_cell (WORKBOOK_CONTROL (wbcg), navigator_last); }
+{ wb_control_navigate_to_cell (GNM_WBC (wbcg), navigator_last); }
static void cb_cs_go_to_cell (WBCGtk *wbcg) { dialog_goto_cell (wbcg); }
static void
@@ -2925,7 +2925,7 @@ wbcg_view_changed (WBCGtk *wbcg,
G_GNUC_UNUSED GParamSpec *pspec,
Workbook *old_wb)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
Workbook *wb = wb_control_get_workbook (wbc);
WorkbookView *wbv = wb_control_view (wbc);
@@ -3359,7 +3359,7 @@ cb_custom_color_created (GOActionComboColor *caction, GtkWidget *dialog, WBCGtk
static void
cb_fore_color_changed (GOActionComboColor *a, WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GnmStyle *mstyle;
GOColor c;
gboolean is_default;
@@ -3408,7 +3408,7 @@ wbc_gtk_init_color_fore (WBCGtk *gtk)
static void
cb_back_color_changed (GOActionComboColor *a, WBCGtk *wbcg)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
+ WorkbookControl *wbc = GNM_WBC (wbcg);
GnmStyle *mstyle;
GOColor c;
gboolean is_default;
@@ -3619,7 +3619,7 @@ cb_font_changed (GtkAction *act, WBCGtk *gtk)
gnm_style_set_font_name (style, family);
gnm_style_set_font_size (style, size / (double)PANGO_SCALE);
- cmd_selection_format (WORKBOOK_CONTROL (gtk), style, NULL, title);
+ cmd_selection_format (GNM_WBC (gtk), style, NULL, title);
g_free (title);
}
}
@@ -3924,7 +3924,7 @@ regenerate_window_menu (WBCGtk *gtk, Workbook *wb, unsigned i)
/* How many controls are there? */
count = 0;
WORKBOOK_FOREACH_CONTROL (wb, wbv, wbc, {
- if (IS_WBC_GTK (wbc))
+ if (GNM_IS_WBC_GTK (wbc))
count++;
});
@@ -3932,7 +3932,7 @@ regenerate_window_menu (WBCGtk *gtk, Workbook *wb, unsigned i)
WORKBOOK_FOREACH_CONTROL (wb, wbv, wbc, {
if (i >= 20)
return i;
- if (IS_WBC_GTK (wbc) && basename) {
+ if (GNM_IS_WBC_GTK (wbc) && basename) {
GString *label = g_string_new (NULL);
char *name;
char const *s;
@@ -3971,7 +3971,7 @@ regenerate_window_menu (WBCGtk *gtk, Workbook *wb, unsigned i)
static void
cb_regenerate_window_menu (WBCGtk *gtk)
{
- Workbook *wb = wb_control_get_workbook (WORKBOOK_CONTROL (gtk));
+ Workbook *wb = wb_control_get_workbook (GNM_WBC (gtk));
GList const *ptr;
unsigned i;
@@ -4516,7 +4516,7 @@ cb_wbcg_window_state_event (GtkWidget *widget,
static void
cb_auto_expr_cell_changed (GtkWidget *item, WBCGtk *wbcg)
{
- WorkbookView *wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wbv = wb_control_view (GNM_WBC (wbcg));
const GnmEvalPos *ep;
GnmExprTop const *texpr;
GnmValue const *v;
@@ -4546,7 +4546,7 @@ cb_auto_expr_changed (GtkWidget *item, WBCGtk *wbcg)
{
const GnmFunc *func;
const char *descr;
- WorkbookView *wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wbv = wb_control_view (GNM_WBC (wbcg));
if (wbcg->updating_ui)
return;
@@ -4564,7 +4564,7 @@ cb_auto_expr_changed (GtkWidget *item, WBCGtk *wbcg)
static void
cb_auto_expr_precision_toggled (GtkWidget *item, WBCGtk *wbcg)
{
- WorkbookView *wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wbv = wb_control_view (GNM_WBC (wbcg));
if (wbcg->updating_ui)
return;
@@ -4629,7 +4629,7 @@ cb_auto_expr_insert_formula (WBCGtk *wbcg, gboolean below)
dao->put_formulas = TRUE;
specs = g_new0 (analysis_tools_data_auto_expression_t, 1);
- specs->base.wbc = WORKBOOK_CONTROL (wbcg);
+ specs->base.wbc = GNM_WBC (wbcg);
specs->base.input = g_slist_prepend (NULL, value_new_cellrange_r (scg_sheet (scg), input));
g_free (input);
specs->base.group_by = below ? GROUPED_BY_COL : GROUPED_BY_ROW;
@@ -4637,13 +4637,13 @@ cb_auto_expr_insert_formula (WBCGtk *wbcg, gboolean below)
specs->multiple = multiple;
specs->below = below;
specs->func = NULL;
- g_object_get (G_OBJECT (wb_control_view (WORKBOOK_CONTROL (wbcg))),
+ g_object_get (G_OBJECT (wb_control_view (GNM_WBC (wbcg))),
"auto-expr-func", &(specs->func), NULL);
if (specs->func == NULL)
specs->func = gnm_func_lookup_or_add_placeholder ("sum");
gnm_func_ref (specs->func);
- cmd_analysis_tool (WORKBOOK_CONTROL (wbcg), scg_sheet (scg),
+ cmd_analysis_tool (GNM_WBC (wbcg), scg_sheet (scg),
dao, specs, analysis_tool_auto_expression_engine,
TRUE);
}
@@ -4690,7 +4690,7 @@ cb_select_auto_expr (GtkWidget *widget, GdkEvent *event, WBCGtk *wbcg)
{ NULL, NULL }
};
- WorkbookView *wbv = wb_control_view (WORKBOOK_CONTROL (wbcg));
+ WorkbookView *wbv = wb_control_view (GNM_WBC (wbcg));
Sheet *sheet = wb_view_cur_sheet (wbv);
GtkWidget *item, *menu;
int i;
@@ -5288,7 +5288,7 @@ cb_graph_dim_editor_update (GnmExprEntry *gee,
else {
g_return_if_fail (perr.err != NULL);
- wb_control_validation_msg (WORKBOOK_CONTROL (scg_wbcg (scg)),
+ wb_control_validation_msg (GNM_WBC (scg_wbcg (scg)),
GNM_VALIDATION_STYLE_INFO, NULL, perr.err->message);
parse_error_free (&perr);
gtk_editable_select_region (GTK_EDITABLE (gnm_expr_entry_get_entry
(editor->entry)), 0, G_MAXINT);
@@ -5536,7 +5536,7 @@ static void
wbc_gtk_class_init (GObjectClass *gobject_class)
{
WorkbookControlClass *wbc_class =
- WORKBOOK_CONTROL_CLASS (gobject_class);
+ GNM_WBC_CLASS (gobject_class);
g_return_if_fail (wbc_class != NULL);
@@ -5587,7 +5587,7 @@ wbc_gtk_class_init (GObjectClass *gobject_class)
GSF_PARAM_STATIC | G_PARAM_READWRITE));
wbc_gtk_signals [WBC_GTK_MARKUP_CHANGED] = g_signal_new ("markup-changed",
- WBC_GTK_TYPE,
+ GNM_WBC_GTK_TYPE,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (WBCGtkClass, markup_changed),
NULL, NULL,
@@ -5783,7 +5783,7 @@ wbc_gtk_init (GObject *obj)
/* updates the undo/redo menu labels before check_underlines
* to avoid problems like #324692. */
- wb_control_undo_redo_labels (WORKBOOK_CONTROL (wbcg), NULL, NULL);
+ wb_control_undo_redo_labels (GNM_WBC (wbcg), NULL, NULL);
if (GNM_VERSION_MAJOR % 2 != 0 ||
gnm_debug_flag ("underlines")) {
gtk_container_foreach (GTK_CONTAINER (wbcg->menu_zone),
@@ -5807,7 +5807,7 @@ wbc_gtk_init (GObject *obj)
}
GSF_CLASS_FULL (WBCGtk, wbc_gtk, NULL, NULL, wbc_gtk_class_init, NULL,
- wbc_gtk_init, WORKBOOK_CONTROL_TYPE, 0,
+ wbc_gtk_init, GNM_WBC_TYPE, 0,
GSF_INTERFACE (wbcg_go_plot_data_allocator_init, GOG_TYPE_DATA_ALLOCATOR);
GSF_INTERFACE (wbcg_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))
@@ -5883,7 +5883,7 @@ wbc_gtk_new (WorkbookView *optional_view,
GtkWindow *
wbcg_toplevel (WBCGtk *wbcg)
{
- g_return_val_if_fail (IS_WBC_GTK (wbcg), NULL);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), NULL);
return GTK_WINDOW (wbcg->toplevel);
}
@@ -5915,7 +5915,7 @@ wbcg_get_nth_scg (WBCGtk *wbcg, int i)
SheetControlGUI *scg;
GtkWidget *w;
- g_return_val_if_fail (IS_WBC_GTK (wbcg), NULL);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), NULL);
if (NULL != wbcg->snotebook &&
NULL != (w = gtk_notebook_get_nth_page (wbcg->snotebook, i)) &&
@@ -5945,7 +5945,7 @@ wbcg_focus_cur_scg (WBCGtk *wbcg)
{
SheetControlGUI *scg;
- g_return_val_if_fail (IS_WBC_GTK (wbcg), NULL);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), NULL);
if (wbcg->snotebook == NULL)
return NULL;
@@ -5980,13 +5980,13 @@ wbcg_cur_scg (WBCGtk *wbcg)
Sheet *
wbcg_cur_sheet (WBCGtk *wbcg)
{
- return wb_control_cur_sheet (WORKBOOK_CONTROL (wbcg));
+ return wb_control_cur_sheet (GNM_WBC (wbcg));
}
PangoFontDescription *
wbcg_get_font_desc (WBCGtk *wbcg)
{
- g_return_val_if_fail (IS_WBC_GTK (wbcg), NULL);
+ g_return_val_if_fail (GNM_IS_WBC_GTK (wbcg), NULL);
if (!wbcg->font_desc) {
GtkSettings *settings = wbcg_get_gtk_settings (wbcg);
@@ -6016,9 +6016,9 @@ wbcg_find_for_workbook (Workbook *wb,
gboolean has_screen, has_display;
g_return_val_if_fail (IS_WORKBOOK (wb), NULL);
- g_return_val_if_fail (candidate == NULL || IS_WBC_GTK (candidate), NULL);
+ g_return_val_if_fail (candidate == NULL || GNM_IS_WBC_GTK (candidate), NULL);
- if (candidate && wb_control_get_workbook (WORKBOOK_CONTROL (candidate)) == wb)
+ if (candidate && wb_control_get_workbook (GNM_WBC (candidate)) == wb)
return candidate;
if (!pref_screen && candidate)
@@ -6031,7 +6031,7 @@ wbcg_find_for_workbook (Workbook *wb,
has_screen = FALSE;
has_display = FALSE;
WORKBOOK_FOREACH_CONTROL(wb, wbv, wbc, {
- if (IS_WBC_GTK (wbc)) {
+ if (GNM_IS_WBC_GTK (wbc)) {
WBCGtk *wbcg = WBC_GTK (wbc);
GdkScreen *screen = wbcg_get_screen (wbcg);
GdkDisplay *display = gdk_screen_get_display (screen);
diff --git a/src/wbc-gtk.h b/src/wbc-gtk.h
index 3d4e296..0c3d460 100644
--- a/src/wbc-gtk.h
+++ b/src/wbc-gtk.h
@@ -11,9 +11,9 @@
G_BEGIN_DECLS
-#define WBC_GTK_TYPE (wbc_gtk_get_type ())
-#define WBC_GTK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WBC_GTK_TYPE, WBCGtk))
-#define IS_WBC_GTK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WBC_GTK_TYPE))
+#define GNM_WBC_GTK_TYPE (wbc_gtk_get_type ())
+#define WBC_GTK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_WBC_GTK_TYPE, WBCGtk))
+#define GNM_IS_WBC_GTK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_WBC_GTK_TYPE))
GType wbc_gtk_get_type (void);
WBCGtk *wbc_gtk_new (WorkbookView *optional_view,
diff --git a/src/widgets/gnm-dao.c b/src/widgets/gnm-dao.c
index 17be32a..2ffa9f1 100644
--- a/src/widgets/gnm-dao.c
+++ b/src/widgets/gnm-dao.c
@@ -276,7 +276,7 @@ gnm_dao_get_data (GnmDao *gdao, data_analysis_output_t **dao)
dao_ready = ((grp_val != 2) ||
gnm_expr_entry_is_cell_ref
(GNM_EXPR_ENTRY (gdao->output_entry),
- wb_control_cur_sheet (WORKBOOK_CONTROL (gdao->wbcg)),
+ wb_control_cur_sheet (GNM_WBC (gdao->wbcg)),
TRUE));
if (dao_ready && NULL != dao) {
@@ -294,7 +294,7 @@ gnm_dao_get_data (GnmDao *gdao, data_analysis_output_t **dao)
case 2:
output_range = gnm_expr_entry_parse_as_value
(GNM_EXPR_ENTRY (gdao->output_entry),
- wb_control_cur_sheet (WORKBOOK_CONTROL
+ wb_control_cur_sheet (GNM_WBC
(gdao->wbcg)));
*dao = dao_init (*dao, RangeOutput);
dao_load_from_value (*dao, output_range);
@@ -362,7 +362,7 @@ gnm_dao_load_range (GnmDao *gdao, GnmRange const *range)
gnm_expr_entry_load_from_range
(gdao->output_entry,
- wb_control_cur_sheet (WORKBOOK_CONTROL (gdao->wbcg)),
+ wb_control_cur_sheet (GNM_WBC (gdao->wbcg)),
range);
}
diff --git a/src/widgets/gnm-filter-combo-view.c b/src/widgets/gnm-filter-combo-view.c
index 335073f..a7db14b 100644
--- a/src/widgets/gnm-filter-combo-view.c
+++ b/src/widgets/gnm-filter-combo-view.c
@@ -99,7 +99,7 @@ fcombo_activate (SheetObject *so, GtkTreeView *list, WBCGtk *wbcg,
if (set_condition)
cmd_autofilter_set_condition
- (WORKBOOK_CONTROL (wbcg),
+ (GNM_WBC (wbcg),
fcombo->filter, field_num, cond);
}
return TRUE;
diff --git a/src/widgets/gnm-sheet-slicer-combo-view.c b/src/widgets/gnm-sheet-slicer-combo-view.c
index 10018f2..1c80d9f 100644
--- a/src/widgets/gnm-sheet-slicer-combo-view.c
+++ b/src/widgets/gnm-sheet-slicer-combo-view.c
@@ -62,7 +62,7 @@ sscombo_activate (SheetObject *so, GtkTreeView *list, WBCGtk *wbcg, gboolean but
#if 0
GnmSheetSlicerCombo *sscombo = GNM_SHEET_SLICER_COMBO (so);
SheetView *sv = sscombo->sv;
- cmd_set_text (WORKBOOK_CONTROL (wbcg),
+ cmd_set_text (GNM_WBC (wbcg),
sv_sheet (sv), &sv->edit_pos, strval, NULL, TRUE);
#endif
g_free (strval);
diff --git a/src/widgets/gnm-validation-combo-view.c b/src/widgets/gnm-validation-combo-view.c
index 687c2c2..dcb9f0c 100644
--- a/src/widgets/gnm-validation-combo-view.c
+++ b/src/widgets/gnm-validation-combo-view.c
@@ -59,7 +59,7 @@ vcombo_activate (SheetObject *so, GtkTreeView *list, WBCGtk *wbcg,
gtk_tree_model_get (gtk_tree_view_get_model (list), &iter,
1, &strval,
-1);
- cmd_set_text (WORKBOOK_CONTROL (wbcg),
+ cmd_set_text (GNM_WBC (wbcg),
sv_sheet (sv), &sv->edit_pos, strval, NULL, TRUE);
g_free (strval);
}
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 620f8f3..09dbaf2 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -1420,7 +1420,7 @@ cb_gee_key_press_event (GtkEntry *entry,
/* Be careful to restore the editing sheet if we are editing */
sv = sheet_get_view (wbcg->editing_sheet,
- wb_control_view (WORKBOOK_CONTROL (wbcg)));
+ wb_control_view (GNM_WBC (wbcg)));
/* move the edit pos for normal entry */
if (wbcg_edit_finish (wbcg, result, NULL) && result == WBC_EDIT_ACCEPT) {
@@ -1737,7 +1737,7 @@ gee_class_init (GObjectClass *gobject_class)
g_param_spec_object ("wbcg",
P_("WBCGtk"),
P_("The toplevel GUI container associated with the entry."),
- WBC_GTK_TYPE,
+ GNM_WBC_GTK_TYPE,
GSF_PARAM_STATIC | G_PARAM_READWRITE));
g_object_class_install_property
diff --git a/src/workbook-control-priv.h b/src/workbook-control-priv.h
index f6f0d7a..155107f 100644
--- a/src/workbook-control-priv.h
+++ b/src/workbook-control-priv.h
@@ -53,7 +53,7 @@ typedef struct {
char const *title, char const *msg);
} WorkbookControlClass;
-#define WORKBOOK_CONTROL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), WORKBOOK_CONTROL_TYPE,
WorkbookControlClass))
+#define GNM_WBC_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNM_WBC_TYPE, WorkbookControlClass))
G_END_DECLS
diff --git a/src/workbook-control.c b/src/workbook-control.c
index 0403c7e..6eaf661 100644
--- a/src/workbook-control.c
+++ b/src/workbook-control.c
@@ -47,7 +47,7 @@ enum {
PROP_VIEW
};
-#define WBC_CLASS(o) WORKBOOK_CONTROL_CLASS (G_OBJECT_GET_CLASS (o))
+#define WBC_CLASS(o) GNM_WBC_CLASS (G_OBJECT_GET_CLASS (o))
#define WBC_VIRTUAL_FULL(func, handle, arglist, call) \
void wb_control_ ## func arglist \
{ \
@@ -121,7 +121,7 @@ wb_control_sheet_add (WorkbookControl *wbc, SheetView *sv)
{
WorkbookControlClass *wbc_class;
- g_return_if_fail (IS_WORKBOOK_CONTROL (wbc));
+ g_return_if_fail (GNM_IS_WBC (wbc));
wbc_class = WBC_CLASS (wbc);
if (wbc_class != NULL && wbc_class->sheet.add != NULL) {
@@ -147,7 +147,7 @@ wb_control_claim_selection (WorkbookControl *wbc)
{
WorkbookControlClass *wbc_class;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), FALSE);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), FALSE);
wbc_class = WBC_CLASS (wbc);
if (wbc_class != NULL && wbc_class->claim_selection != NULL)
@@ -167,7 +167,7 @@ wb_control_validation_msg (WorkbookControl *wbc, ValidationStyle v,
{
WorkbookControlClass *wbc_class;
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), 1);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), 1);
wbc_class = WBC_CLASS (wbc);
if (wbc_class != NULL && wbc_class->validation_msg != NULL)
@@ -184,7 +184,7 @@ wb_control_validation_msg (WorkbookControl *wbc, ValidationStyle v,
WorkbookView *
wb_control_view (WorkbookControl const *wbc)
{
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), NULL);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), NULL);
return wbc->wb_view;
}
@@ -209,7 +209,7 @@ wb_control_get_doc (WorkbookControl const *wbc)
Workbook *
wb_control_get_workbook (WorkbookControl const *wbc)
{
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), NULL);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), NULL);
return wbc->wb_view ? wb_view_get_workbook (wbc->wb_view) : NULL;
}
@@ -222,7 +222,7 @@ wb_control_get_workbook (WorkbookControl const *wbc)
Sheet *
wb_control_cur_sheet (WorkbookControl const *wbc)
{
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), NULL);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), NULL);
return wb_view_cur_sheet (wbc->wb_view);
}
@@ -235,7 +235,7 @@ wb_control_cur_sheet (WorkbookControl const *wbc)
SheetView *
wb_control_cur_sheet_view (WorkbookControl const *wbc)
{
- g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), NULL);
+ g_return_val_if_fail (GNM_IS_WBC (wbc), NULL);
return wb_view_cur_sheet_view (wbc->wb_view);
}
@@ -471,7 +471,7 @@ static GObjectClass *parent_klass;
static void
wbc_dispose (GObject *obj)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (obj);
+ WorkbookControl *wbc = GNM_WBC (obj);
if (wbc->clipboard_changed_signal) {
g_signal_handler_disconnect (gnm_app_get_app (),
wbc->clipboard_changed_signal);
@@ -506,7 +506,7 @@ workbook_control_class_init (GObjectClass *object_class)
static void
workbook_control_init (GObject *obj)
{
- WorkbookControl *wbc = WORKBOOK_CONTROL (obj);
+ WorkbookControl *wbc = GNM_WBC (obj);
wbc->clipboard_changed_signal = g_signal_connect (
gnm_app_get_app (),
@@ -540,7 +540,7 @@ wb_control_set_view (WorkbookControl *wbc,
{
WorkbookView *wbv;
- g_return_if_fail (IS_WORKBOOK_CONTROL (wbc));
+ g_return_if_fail (GNM_IS_WBC (wbc));
g_return_if_fail (wbc->wb_view == NULL);
wbv = (opt_view != NULL) ? opt_view : workbook_view_new (opt_wb);
@@ -554,7 +554,7 @@ wb_control_init_state (WorkbookControl *wbc)
WorkbookView *wbv;
WorkbookControlClass *wbc_class;
- g_return_if_fail (IS_WORKBOOK_CONTROL (wbc));
+ g_return_if_fail (GNM_IS_WBC (wbc));
/* Setup the undo/redo combos */
command_setup_combos (wbc);
diff --git a/src/workbook-control.h b/src/workbook-control.h
index 74336c4..a1bbcaf 100644
--- a/src/workbook-control.h
+++ b/src/workbook-control.h
@@ -8,9 +8,9 @@
G_BEGIN_DECLS
-#define WORKBOOK_CONTROL_TYPE (workbook_control_get_type ())
-#define WORKBOOK_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), WORKBOOK_CONTROL_TYPE,
WorkbookControl))
-#define IS_WORKBOOK_CONTROL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WORKBOOK_CONTROL_TYPE))
+#define GNM_WBC_TYPE (workbook_control_get_type ())
+#define GNM_WBC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNM_WBC_TYPE, WorkbookControl))
+#define GNM_IS_WBC(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_WBC_TYPE))
GType workbook_control_get_type (void);
void wb_control_set_view (WorkbookControl *wbc,
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 93a5ac8..9ba6f7b 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -568,7 +568,7 @@ void
wb_view_attach_control (WorkbookView *wbv, WorkbookControl *wbc)
{
g_return_if_fail (IS_WORKBOOK_VIEW (wbv));
- g_return_if_fail (IS_WORKBOOK_CONTROL (wbc));
+ g_return_if_fail (GNM_IS_WBC (wbc));
g_return_if_fail (wb_control_view (wbc) == NULL);
if (wbv->wb_controls == NULL)
@@ -583,7 +583,7 @@ wb_view_attach_control (WorkbookView *wbv, WorkbookControl *wbc)
void
wb_view_detach_control (WorkbookControl *wbc)
{
- g_return_if_fail (IS_WORKBOOK_CONTROL (wbc));
+ g_return_if_fail (GNM_IS_WBC (wbc));
g_return_if_fail (IS_WORKBOOK_VIEW (wb_control_view (wbc)));
g_ptr_array_remove (wbc->wb_view->wb_controls, wbc);
[
Date Prev][Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
