Commit ffddb670 authored by Morten Welinder's avatar Morten Welinder

Renaming

Namespace cleanup.
parent afdf443c
......@@ -331,11 +331,11 @@ src/widgets/gnm-sheet-sel.c
src/widgets/gnm-sheet-slicer-combo-view.c
src/widgets/gnm-so-anchor-mode-chooser.c
src/widgets/gnm-workbook-sel.c
src/widgets/gnumeric-cell-renderer-expr-entry.c
src/widgets/gnumeric-cell-renderer-text.c
src/widgets/gnumeric-cell-renderer-toggle.c
src/widgets/gnumeric-expr-entry.c
src/widgets/gnumeric-text-view.c
src/widgets/gnm-cell-renderer-expr-entry.c
src/widgets/gnm-cell-renderer-text.c
src/widgets/gnm-cell-renderer-toggle.c
src/widgets/gnm-expr-entry.c
src/widgets/gnm-text-view.c
src/workbook-cmd-format.c
src/workbook-control.c
src/workbook-view.c
......
......@@ -390,11 +390,11 @@ src/widgets/gnm-sheet-sel.c
src/widgets/gnm-sheet-slicer-combo-view.c
src/widgets/gnm-so-anchor-mode-chooser.c
src/widgets/gnm-workbook-sel.c
src/widgets/gnumeric-cell-renderer-expr-entry.c
src/widgets/gnumeric-cell-renderer-text.c
src/widgets/gnumeric-cell-renderer-toggle.c
src/widgets/gnumeric-expr-entry.c
src/widgets/gnumeric-text-view.c
src/widgets/gnm-cell-renderer-expr-entry.c
src/widgets/gnm-cell-renderer-text.c
src/widgets/gnm-cell-renderer-toggle.c
src/widgets/gnm-expr-entry.c
src/widgets/gnm-text-view.c
src/workbook-cmd-format.c
src/workbook-control.c
src/workbook-view.c
......
......@@ -224,12 +224,12 @@ widgets_sources = \
widgets/gnm-sheet-slicer-combo-view.c \
widgets/gnm-so-anchor-mode-chooser.c \
widgets/gnm-workbook-sel.c \
widgets/gnumeric-cell-renderer-text.c \
widgets/gnumeric-cell-renderer-expr-entry.c \
widgets/gnumeric-cell-renderer-toggle.c \
widgets/gnumeric-dashed-canvas-line.c \
widgets/gnumeric-expr-entry.c \
widgets/gnumeric-text-view.c
widgets/gnm-cell-renderer-text.c \
widgets/gnm-cell-renderer-expr-entry.c \
widgets/gnm-cell-renderer-toggle.c \
widgets/gnm-dashed-canvas-line.c \
widgets/gnm-expr-entry.c \
widgets/gnm-text-view.c
widgets_headers = \
widgets/gnm-dao.h \
......@@ -245,12 +245,12 @@ widgets_headers = \
widgets/gnm-sheet-slicer-combo-view.h \
widgets/gnm-so-anchor-mode-chooser.h \
widgets/gnm-workbook-sel.h \
widgets/gnumeric-cell-renderer-text.h \
widgets/gnumeric-cell-renderer-expr-entry.h \
widgets/gnumeric-cell-renderer-toggle.h \
widgets/gnumeric-dashed-canvas-line.h \
widgets/gnumeric-expr-entry.h \
widgets/gnumeric-text-view.h
widgets/gnm-cell-renderer-text.h \
widgets/gnm-cell-renderer-expr-entry.h \
widgets/gnm-cell-renderer-toggle.h \
widgets/gnm-dashed-canvas-line.h \
widgets/gnm-expr-entry.h \
widgets/gnm-text-view.h
tools_sources = \
tools/analysis-anova.c \
......@@ -681,7 +681,7 @@ local.def: stamp-local.def
@true
stamp-local.def: $(libspreadsheet_include_HEADERS) Makefile $(top_srcdir)/tools/dumpdef.pl
hdrs='$(libspreadsheet_include_HEADERS) dialogs/dialogs.h dialogs/tool-dialogs.h tools/dao.h tools/goal-seek.h tools/analysis-tools.h tools/gnm-solver.h widgets/gnumeric-expr-entry.h'; \
hdrs='$(libspreadsheet_include_HEADERS) dialogs/dialogs.h dialogs/tool-dialogs.h tools/dao.h tools/goal-seek.h tools/analysis-tools.h tools/gnm-solver.h widgets/gnm-expr-entry.h'; \
hdrs_list=''; \
for hdr in $$hdrs; do \
if test -f $(srcdir)/$$hdr; then \
......
......@@ -36,7 +36,7 @@
#include <value.h>
#include <wbc-gtk.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <tools/filter.h>
#include <tools/analysis-tools.h>
......
......@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -47,7 +47,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -46,7 +46,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -49,7 +49,7 @@
#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
......
......@@ -30,7 +30,7 @@
#include <wbc-gtk.h>
#include <ranges.h>
#include <commands.h>
#include <widgets/gnumeric-text-view.h>
#include <widgets/gnm-text-view.h>
#define COMMENT_DIALOG_KEY "cell-comment-dialog"
......
......@@ -49,7 +49,7 @@
#include <commands.h>
#include <mathfunc.h>
#include <preview-grid.h>
#include <widgets/gnumeric-dashed-canvas-line.h>
#include <widgets/gnm-dashed-canvas-line.h>
#include <widgets/gnm-format-sel.h>
#include <style-conditions.h>
......@@ -1175,7 +1175,7 @@ border_format_has_changed (FormatState *state, BorderPicker *edge)
for (i = 0; line_info[i].states != 0 ; ++i ) {
if (line_info[i].location == edge->index &&
state->border.lines[i] != NULL) {
gnumeric_dashed_canvas_line_set_dash_index (
gnm_dashed_canvas_line_set_dash_index (
GNM_DASHED_CANVAS_LINE (state->border.lines[i]),
edge->pattern_index);
}
......@@ -1364,7 +1364,7 @@ draw_border_preview (FormatState *state)
& state->border.edge[line_info[i].location];
state->border.lines[i] =
goc_item_new (group,
gnumeric_dashed_canvas_line_get_type (),
gnm_dashed_canvas_line_get_type (),
"x0", line_info[i].points[0],
"y0", line_info[i].points[1],
"x1", line_info[i].points[2],
......@@ -1372,7 +1372,7 @@ draw_border_preview (FormatState *state)
NULL);
style = go_styled_object_get_style (GO_STYLED_OBJECT (state->border.lines[i]));
style->line.color = p->rgba;
gnumeric_dashed_canvas_line_set_dash_index (
gnm_dashed_canvas_line_set_dash_index (
GNM_DASHED_CANVAS_LINE (state->border.lines[i]),
p->pattern_index);
} else
......
......@@ -41,8 +41,8 @@
#include <sheet-view.h>
#include <wbc-gtk.h>
#include <gnumeric-conf.h>
#include <widgets/gnumeric-cell-renderer-toggle.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-cell-renderer-toggle.h>
#include <widgets/gnm-expr-entry.h>
#include <value.h>
#include <gsf/gsf-impl-utils.h>
......@@ -1015,7 +1015,7 @@ dialog_init (SortFlowState *state)
"text", ITEM_NAME, NULL);
gtk_tree_view_append_column (state->treeview, column);
renderer = gnumeric_cell_renderer_toggle_new ();
renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_toggled_descending), state);
......
......@@ -33,8 +33,8 @@
#include <value.h>
#include <sheet-view.h>
#include <selection.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-cell-renderer-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <wbc-gtk.h>
#include <dialogs/dao-gui-utils.h>
......@@ -59,7 +59,7 @@ typedef struct {
GtkTreeView *source_view;
GtkTreeModel *source_areas;
GnumericCellRendererExprEntry *cellrenderer;
GnmCellRendererExprEntry *cellrenderer;
GdkPixbuf *pixmap;
GtkButton *clear;
......@@ -281,7 +281,7 @@ cb_consolidate_ok_clicked (GtkWidget *button, ConsolidateState *state)
data_analysis_output_t *dao;
if (state->cellrenderer->entry)
gnumeric_cell_renderer_expr_entry_editing_done (
gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer);
......@@ -341,7 +341,7 @@ cb_clear_clicked (G_GNUC_UNUSED GtkButton *button,
g_return_if_fail (state != NULL);
if (state->cellrenderer->entry)
gnumeric_cell_renderer_expr_entry_editing_done (
gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer);
......@@ -360,7 +360,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkButton *button,
gtk_tree_view_get_selection (state->source_view);
if (state->cellrenderer->entry)
gnumeric_cell_renderer_expr_entry_editing_done (
gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer);
if (!gtk_tree_selection_get_selected (selection, NULL, &sel_iter))
......@@ -422,7 +422,7 @@ setup_widgets (ConsolidateState *state, GtkBuilder *gui)
(state->source_view );
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
renderer = gnumeric_cell_renderer_expr_entry_new (state->base.wbcg);
renderer = gnm_cell_renderer_expr_entry_new (state->base.wbcg);
state->cellrenderer =
GNM_CELL_RENDERER_EXPR_ENTRY (renderer);
column = gtk_tree_view_column_new_with_attributes
......
......@@ -35,7 +35,7 @@
#include <parse-util.h>
#include <commands.h>
#include <ranges.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <glib/gi18n.h>
#define DIALOG_DATA_TABLE_KEY "dialog-data-table"
......
......@@ -39,9 +39,9 @@
#include <gui-util.h>
#include <parse-util.h>
#include <commands.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-toggle.h>
#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-cell-renderer-expr-entry.h>
#include <widgets/gnm-cell-renderer-toggle.h>
#include <string.h>
......@@ -885,7 +885,7 @@ name_guru_check_expression (NameGuruState *state, gchar *text,
static void
cb_name_guru_content_edited
(G_GNUC_UNUSED GnumericCellRendererExprEntry *cell,
(G_GNUC_UNUSED GnmCellRendererExprEntry *cell,
gchar *path_string,
gchar *new_text,
NameGuruState *state)
......@@ -1107,7 +1107,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview), column);
if (is_paste_dialog) {
renderer = gnumeric_cell_renderer_toggle_new ();
renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_name_guru_paste), state);
......@@ -1120,7 +1120,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
column);
} else {
renderer = gnumeric_cell_renderer_toggle_new ();
renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_name_guru_add_delete), state);
......@@ -1133,7 +1133,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (state->treeview),
column);
renderer = gnumeric_cell_renderer_toggle_new ();
renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_name_guru_switch_scope),
......@@ -1148,7 +1148,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
column);
}
renderer = gnumeric_cell_renderer_expr_entry_new (state->wbcg);
renderer = gnm_cell_renderer_expr_entry_new (state->wbcg);
g_signal_connect (G_OBJECT (renderer), "edited",
G_CALLBACK (cb_name_guru_content_edited), state);
column = gtk_tree_view_column_new_with_attributes
......
......@@ -42,8 +42,8 @@
#include <func.h>
#include <gnm-format.h>
#include <goffice/goffice.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-cell-renderer-expr-entry.h>
#include <locale.h>
#include <string.h>
......@@ -83,7 +83,7 @@ typedef struct
gint old_height_request;
gint old_width_request;
GnumericCellRendererExprEntry *cellrenderer;
GnmCellRendererExprEntry *cellrenderer;
GtkTreeViewColumn *column;
GtkCellEditable *editable;
} FormulaGuruState;
......@@ -668,7 +668,7 @@ cb_dialog_formula_guru_ok_clicked (G_GNUC_UNUSED GtkWidget *button,
FormulaGuruState *state)
{
if (state->cellrenderer->entry)
gnumeric_cell_renderer_expr_entry_editing_done (
gnm_cell_renderer_expr_entry_editing_done (
GTK_CELL_EDITABLE (state->cellrenderer->entry),
state->cellrenderer);
wbcg_edit_finish (state->wbcg,
......@@ -890,14 +890,14 @@ dialog_formula_guru_init (FormulaGuruState *state)
G_CALLBACK (cb_dialog_formula_guru_selection_changed), state);
column = gtk_tree_view_column_new_with_attributes (_("Name"),
gnumeric_cell_renderer_text_new (),
gnm_cell_renderer_text_new (),
"text", ARG_NAME, NULL);
gtk_tree_view_append_column (state->treeview, column);
column = gtk_tree_view_column_new_with_attributes (_("Type"),
gnumeric_cell_renderer_text_new (),
gnm_cell_renderer_text_new (),
"text", ARG_TYPE, NULL);
gtk_tree_view_append_column (state->treeview, column);
renderer = gnumeric_cell_renderer_expr_entry_new (state->wbcg);
renderer = gnm_cell_renderer_expr_entry_new (state->wbcg);
state->cellrenderer = GNM_CELL_RENDERER_EXPR_ENTRY (renderer);
g_signal_connect (G_OBJECT (renderer), "edited",
G_CALLBACK (cb_dialog_formula_guru_edited), state);
......
......@@ -43,7 +43,7 @@
#include <workbook-view.h>
#include <tools/goal-seek.h>
#include <mathfunc.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <selection.h>
#include <application.h>
......
......@@ -26,7 +26,7 @@
#include <dialogs/help.h>
#include <commands.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <expr-name.h>
#include <expr.h>
#include <gui-util.h>
......
......@@ -36,7 +36,7 @@
#include <value.h>
#include <commands.h>
#include <selection.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#define MERGE_KEY "merge-dialog"
......
......@@ -34,7 +34,7 @@
#include <workbook-control.h>
#include <wbc-gtk.h>
#include <number-match.h>
#include <widgets/gnumeric-cell-renderer-text.h>
#include <widgets/gnm-cell-renderer-text.h>
#include <gnumeric-conf.h>
......
......@@ -44,7 +44,7 @@
#include <value.h>
#include <commands.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <string.h>
......
......@@ -45,7 +45,7 @@
#include <value.h>
#include <commands.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <string.h>
......
......@@ -29,7 +29,7 @@
#include <gnumeric-conf.h>
#include <gui-util.h>
#include <search.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <wbc-gtk.h>
#include <selection.h>
......
......@@ -40,7 +40,7 @@
#include <sheet-object-cell-comment.h>
#include <selection.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <string.h>
#define SEARCH_KEY "search-dialog"
......
......@@ -40,8 +40,8 @@
#include <style-color.h>
#include <commands.h>
#include <application.h>
#include <widgets/gnumeric-cell-renderer-text.h>
#include <widgets/gnumeric-cell-renderer-toggle.h>
#include <widgets/gnm-cell-renderer-text.h>
#include <widgets/gnm-cell-renderer-toggle.h>
#include <goffice/goffice.h>
#include <string.h>
......@@ -697,7 +697,7 @@ create_sheet_list (SheetManager *state)
selection = gtk_tree_view_get_selection (state->sheet_list);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
renderer = gnumeric_cell_renderer_toggle_new ();
renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_toggled_lock), state);
......@@ -710,7 +710,7 @@ create_sheet_list (SheetManager *state)
NULL);
gtk_tree_view_append_column (state->sheet_list, column);
renderer = gnumeric_cell_renderer_toggle_new ();
renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer),
"toggled",
G_CALLBACK (cb_toggled_visible), state);
......@@ -723,7 +723,7 @@ create_sheet_list (SheetManager *state)
NULL);
gtk_tree_view_append_column (state->sheet_list, column);
renderer = gnumeric_cell_renderer_toggle_new ();
renderer = gnm_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer), "toggled",
G_CALLBACK (cb_toggled_direction), state);
column = gtk_tree_view_column_new_with_attributes
......@@ -740,7 +740,7 @@ create_sheet_list (SheetManager *state)
column = gtk_tree_view_column_new_with_attributes
/*Translators: Table header for column with number of "Rows"*/
(C_("sheetlist", "Rows"),
gnumeric_cell_renderer_text_new (),
gnm_cell_renderer_text_new (),
"text", SHEET_ROW_MAX,
NULL);
gtk_tree_view_column_set_visible (column, FALSE);
......@@ -750,7 +750,7 @@ create_sheet_list (SheetManager *state)
column = gtk_tree_view_column_new_with_attributes
/*Translators: Table header for column with number of "Cols"*/
(C_("sheetlist", "Cols"),
gnumeric_cell_renderer_text_new (),
gnm_cell_renderer_text_new (),
"text", SHEET_COL_MAX,
NULL);
gtk_tree_view_column_set_visible (column, FALSE);
......@@ -758,14 +758,14 @@ create_sheet_list (SheetManager *state)
state->col_max_column = column;
column = gtk_tree_view_column_new_with_attributes (_("Current Name"),
gnumeric_cell_renderer_text_new (),
gnm_cell_renderer_text_new (),
"text", SHEET_NAME,
"background-rgba",BACKGROUND_COLOUR,
"foreground-rgba",FOREGROUND_COLOUR,
NULL);
gtk_tree_view_append_column (state->sheet_list, column);
renderer = gnumeric_cell_renderer_text_new ();
renderer = gnm_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer),
"editable", TRUE,
"editable-set", TRUE,
......
......@@ -38,7 +38,7 @@
#include <commands.h>
#include <selection.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <tools/data-shuffling.h>
......
......@@ -32,7 +32,7 @@
#include <value.h>
#include <wbc-gtk.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <tools/simulation.h>
......
......@@ -35,7 +35,7 @@
#include <gui-util.h>
#include <parse-util.h>
#include <commands.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <glib/gi18n.h>
#define DIALOG_SO_LIST_KEY "so-list"
......
......@@ -32,7 +32,7 @@
#include <sheet-object.h>
#include <gnm-so-line.h>
#include <goffice/goffice.h>
#include <widgets/gnumeric-text-view.h>
#include <widgets/gnm-text-view.h>
typedef struct {
GObject *so;
......
......@@ -44,7 +44,7 @@
#include <selection.h>
#include <application.h>
#include <tools/gnm-solver.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <goffice/goffice.h>
#include <string.h>
......
......@@ -28,7 +28,7 @@
#include <dialogs/help.h>
#include <gui-util.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <tools/tabulate.h>
#include <wbc-gtk.h>
#include <ranges.h>
......
......@@ -17,7 +17,7 @@
#include <gnumeric.h>
#include <numbers.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
typedef struct _scenario_state scenario_state_t;
......
......@@ -22,7 +22,7 @@
#include <workbook.h>
#include <libgnumeric.h>
#include <wbc-gtk.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <goffice/goffice.h>
#include <atk/atkrelation.h>
......
......@@ -32,7 +32,7 @@
#include <workbook.h>
#include <wbc-gtk.h>
#include <gui-util.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#define GNUMERIC_ITEM "EDIT"
#include <gsf/gsf-impl-utils.h>
......
......@@ -60,7 +60,7 @@
#include <gnm-pane-impl.h>
#include <item-bar.h>
#include <item-cursor.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <gnm-sheet-slicer.h>
#include <input-msg.h>
......
......@@ -42,7 +42,7 @@
#include <sheet.h>
#include <cell.h>
#include <mathfunc.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <dialogs/dialogs.h>
#include <dialogs/help.h>
#include <xml-sax.h>
......
......@@ -47,7 +47,7 @@
#include <selection.h>
#include <validation.h>
#include <value.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <gui-util.h>
#include <command-context.h>
......
......@@ -5,7 +5,7 @@
#include <wbc-gtk.h>
#include <workbook-control-priv.h>
#include <style.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <widgets/gnm-notebook.h>
#include <goffice/goffice.h>
......
......@@ -4,7 +4,7 @@
#include <gnumeric.h>
#include <gnumeric-fwd.h>
#include <workbook-control.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
G_BEGIN_DECLS
......
/* gnumeric-cell-renderer-expr-entry.c
/* gnm-cell-renderer-expr-entry.c
* Copyright (C) 2002 Andreas J. Guelzow <aguelzow@taliesin.ca>
*
* This program is free software; you can redistribute it and/or modify
......@@ -16,17 +16,17 @@
*/
#include <gnumeric-config.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-cell-renderer-expr-entry.h>
#include <widgets/gnm-expr-entry.h>
#include <wbc-gtk.h>
#include <dead-kittens.h>
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY_PATH "gnumeric-cell-renderer-expr-entry-path"
static void gnumeric_cell_renderer_expr_entry_class_init
(GnumericCellRendererExprEntryClass *cell_expr_entry_class) ;
(GnmCellRendererExprEntryClass *cell_expr_entry_class) ;
static GnumericCellRendererTextClass *parent_class = NULL;
static GnmCellRendererTextClass *parent_class = NULL;
static GtkCellEditable *gnumeric_cell_renderer_expr_entry_start_editing
(GtkCellRenderer *cell,
......@@ -38,7 +38,7 @@ static GtkCellEditable *gnumeric_cell_renderer_expr_entry_start_editing
GtkCellRendererState flags);
GType
gnumeric_cell_renderer_expr_entry_get_type (void)
gnm_cell_renderer_expr_entry_get_type (void)
{
static GType cell_expr_entry_type = 0;
......@@ -46,19 +46,19 @@ gnumeric_cell_renderer_expr_entry_get_type (void)
{
static const GTypeInfo cell_expr_entry_info =
{
sizeof (GnumericCellRendererExprEntryClass),
sizeof (GnmCellRendererExprEntryClass),
</