From 0390e6caa65f141a8be5df2e8b33e4eff7d65f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20K=C3=A5re=20Hellan?= Date: Sat, 13 Apr 2002 07:21:08 +0000 Subject: [PATCH] s/ENABLE_BONOBO/WITH_BONOBO/ * src/gui-file.c: s/ENABLE_BONOBO/WITH_BONOBO/ * src/gui-util.c: Ditto. * src/history.c: Ditto. * src/main.c: Ditto. * src/sheet.c: Ditto. * src/sheet-object.c: Ditto. * src/workbook-control-gui.c: Ditto. * src/workbook-format-toolbar.c: Ditto. * src/workbook-object-toolbar.c: * src/workbook.c: Ditto. * src/workbook-private.c: Ditto. * src/xml-io.c: Ditto. * plugins/excel/ms-chart.c: Ditto * plugins/excel/ms-excel-read.c: Ditto --- ChangeLog | 26 +++++++++++++++++++++ OChangeLog-2003-12-23 | 26 +++++++++++++++++++++ OChangeLog-2005-11-14 | 26 +++++++++++++++++++++ plugins/excel/ChangeLog | 6 +++++ plugins/excel/ms-chart.c | 20 ++++++++-------- plugins/excel/ms-excel-read.c | 6 ++--- src/gui-file.c | 2 +- src/gui-util.c | 4 ++-- src/history.c | 14 +++++------ src/libgnumeric.c | 10 ++++---- src/main.c | 10 ++++---- src/sheet-object.c | 4 ++-- src/sheet.c | 2 +- src/workbook-control-gui.c | 44 +++++++++++++++++------------------ src/workbook-format-toolbar.c | 14 +++++------ src/workbook-object-toolbar.c | 4 ++-- src/workbook-private.c | 6 ++--- src/workbook.c | 4 ++-- src/xml-io.c | 2 +- 19 files changed, 157 insertions(+), 73 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecea9f6f5..1693b506d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2002-04-13 Jon K Hellan + + * src/gui-file.c: s/ENABLE_BONOBO/WITH_BONOBO/ + + * src/gui-util.c: Ditto. + + * src/history.c: Ditto. + + * src/main.c: Ditto. + + * src/sheet.c: Ditto. + + * src/sheet-object.c: Ditto. + + * src/workbook-control-gui.c: Ditto. + + * src/workbook-format-toolbar.c: Ditto. + + * src/workbook-object-toolbar.c: + + * src/workbook.c: Ditto. + + * src/workbook-private.c: Ditto. + + * src/xml-io.c: Ditto. + 2002-04-13 Andreas J. Guelzow * schemas/gnumeric-general.schemas : add 2 undo preference settings diff --git a/OChangeLog-2003-12-23 b/OChangeLog-2003-12-23 index ecea9f6f5..1693b506d 100644 --- a/OChangeLog-2003-12-23 +++ b/OChangeLog-2003-12-23 @@ -1,3 +1,29 @@ +2002-04-13 Jon K Hellan + + * src/gui-file.c: s/ENABLE_BONOBO/WITH_BONOBO/ + + * src/gui-util.c: Ditto. + + * src/history.c: Ditto. + + * src/main.c: Ditto. + + * src/sheet.c: Ditto. + + * src/sheet-object.c: Ditto. + + * src/workbook-control-gui.c: Ditto. + + * src/workbook-format-toolbar.c: Ditto. + + * src/workbook-object-toolbar.c: + + * src/workbook.c: Ditto. + + * src/workbook-private.c: Ditto. + + * src/xml-io.c: Ditto. + 2002-04-13 Andreas J. Guelzow * schemas/gnumeric-general.schemas : add 2 undo preference settings diff --git a/OChangeLog-2005-11-14 b/OChangeLog-2005-11-14 index ecea9f6f5..1693b506d 100644 --- a/OChangeLog-2005-11-14 +++ b/OChangeLog-2005-11-14 @@ -1,3 +1,29 @@ +2002-04-13 Jon K Hellan + + * src/gui-file.c: s/ENABLE_BONOBO/WITH_BONOBO/ + + * src/gui-util.c: Ditto. + + * src/history.c: Ditto. + + * src/main.c: Ditto. + + * src/sheet.c: Ditto. + + * src/sheet-object.c: Ditto. + + * src/workbook-control-gui.c: Ditto. + + * src/workbook-format-toolbar.c: Ditto. + + * src/workbook-object-toolbar.c: + + * src/workbook.c: Ditto. + + * src/workbook-private.c: Ditto. + + * src/xml-io.c: Ditto. + 2002-04-13 Andreas J. Guelzow * schemas/gnumeric-general.schemas : add 2 undo preference settings diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog index e13759b2e..33bf62f85 100644 --- a/plugins/excel/ChangeLog +++ b/plugins/excel/ChangeLog @@ -1,3 +1,9 @@ +2002-04-13 Jon K Hellan + + * ms-chart.c: s/ENABLE_BONOBO/WITH_BONOBO/ + + * ms-excel-read.c: Ditto + 2002-03-27 Jody Goldberg * ms-biff.c (ms_biff_query_set_decrypt) : protect against NULL diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c index 9c2b858d9..ff5b59b64 100644 --- a/plugins/excel/ms-chart.c +++ b/plugins/excel/ms-chart.c @@ -24,7 +24,7 @@ #include #include -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include #endif #include @@ -57,7 +57,7 @@ char const *const ms_vector_purpose_type_name [] = typedef struct _ExcelChartSeries { struct { -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO GnmGraphVectorType type; #endif int count, remote_ID; @@ -125,13 +125,13 @@ excel_chart_series_new (void) series->xml = NULL; for (i = MS_VECTOR_PURPOSE_MAX; i-- > 0 ; ) { series->vector [i].remote_ID = -1; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO series->vector [i].type = GNM_VECTOR_AUTO; /* may be reset later */ #endif } /* labels are always strings */ -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO series->vector [MS_VECTOR_PURPOSE_LABELS].type = GNM_VECTOR_STRING; #endif @@ -156,7 +156,7 @@ excel_chart_series_write_xml (ExcelChartSeries *series, xmlAddChild (data, series->xml); for (i = 0 ; i < MS_VECTOR_PURPOSE_MAX; i++ ) if (series->vector [i].remote_ID >= 0) { -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO xmlNode *v = gnm_graph_series_add_dimension (series->xml, ms_vector_purpose_type_name [i]); if (v != NULL) @@ -344,7 +344,7 @@ BC_R(ai)(ExcelChartHandler const *handle, g_return_val_if_fail (sheet != NULL, FALSE); g_return_val_if_fail (s->currentSeries != NULL, TRUE); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO s->currentSeries->vector [purpose].remote_ID = gnm_graph_add_vector (s->graph, expr, s->currentSeries->vector [purpose].type, @@ -1723,7 +1723,7 @@ BC_R(vector_details)(ExcelChartReadState *s, BiffQuery *q, ExcelChartSeries *ser MS_VECTOR_PURPOSE purpose, int type_offset, int count_offset, char const *name) { -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO GnmGraphVectorType type; guint16 e_type = MS_OLE_GET_GUINT16 (q->data + type_offset); @@ -1827,7 +1827,7 @@ BC_R(seriestext)(ExcelChartHandler const *handle, /* A quick heuristic */ if (s->currentSeries != NULL && s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].remote_ID == -1) { -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].type = GNM_VECTOR_STRING; s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].remote_ID = @@ -2417,7 +2417,7 @@ ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GObject state.xml.currentChartGroup = NULL; state.xml.dataFormat = NULL; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO if (graph != NULL) state.graph = GNUMERIC_GRAPH (graph); else @@ -2524,7 +2524,7 @@ ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GObject state.prev_opcode = q->opcode; } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO if (state.graph != NULL) gnm_graph_import_specification (state.graph, state.xml.doc); #endif diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c index 573a8fff1..c202d4d82 100644 --- a/plugins/excel/ms-excel-read.c +++ b/plugins/excel/ms-excel-read.c @@ -45,7 +45,7 @@ #include #include #include -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO # include #endif @@ -392,7 +392,7 @@ ms_sheet_create_obj (MSContainer *container, MSObj *obj) } case 0x05: { /* Chart */ -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO so = SHEET_OBJECT (gnm_graph_new (wb)); #else so = sheet_object_box_new (FALSE); /* placeholder */ @@ -3823,7 +3823,7 @@ ms_excel_read_sheet (BiffQuery *q, ExcelWorkbook *wb, */ if (q->opcode == BIFF_CHART_units) { GObject *graph = -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO gnm_graph_new (esheet->wb->gnum_wb); #else NULL; diff --git a/src/gui-file.c b/src/gui-file.c index ddd937c2e..e91e66a67 100644 --- a/src/gui-file.c +++ b/src/gui-file.c @@ -348,7 +348,7 @@ gui_file_save (WorkbookControlGUI *wbcg, WorkbookView *wb_view) return wb_view_save (wb_view, COMMAND_CONTEXT (wbcg)); } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO static GnumFileSaver * ask_for_file_saver (WorkbookControlGUI *wbcg, WorkbookView *wb_view) { diff --git a/src/gui-util.c b/src/gui-util.c index f8e8a7be0..023b41dd1 100644 --- a/src/gui-util.c +++ b/src/gui-util.c @@ -25,7 +25,7 @@ #include #include -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO # include # include "workbook-private.h" #endif @@ -856,7 +856,7 @@ gnumeric_non_modal_dialog (WorkbookControlGUI *wbcg, GtkWindow *dialog) G_CALLBACK (cb_non_modal_dialog_keypress), NULL); } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO /* * gnumeric_inject_widget_into_bonoboui : * diff --git a/src/history.c b/src/history.c index 444c960e0..372f79438 100644 --- a/src/history.c +++ b/src/history.c @@ -17,12 +17,12 @@ #include #include #include -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include #endif /* Command callback called on activation of a file history menu item. */ -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO #define UGLY_GNOME_UI_KEY "HistoryFilename" @@ -80,7 +80,7 @@ history_item_label (const gchar *name, const gint accel_number) /* * Create a history menu item in a menu at a given position. */ -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO static void history_menu_item_create (WorkbookControlGUI *wbcg, gchar *name, gint accel_number, GtkWidget *menu, gint pos) @@ -105,7 +105,7 @@ history_menu_item_create (WorkbookControlGUI *wbcg, gchar *name, gint accel_numb } #endif -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO typedef struct { GtkWidget *menu; gint pos; @@ -211,7 +211,7 @@ history_menu_insert_items (WorkbookControlGUI *wbcg, GList *name_list) } #endif -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO /* * Remove the history list items from the file menu of the workbook * specified. @@ -296,7 +296,7 @@ history_menu_setup (WorkbookControlGUI *wbcg, GList *name_list) { g_return_if_fail (name_list != NULL); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO /* Insert the items */ history_menu_insert_items (wbcg, name_list); #else @@ -324,7 +324,7 @@ history_control_fill (WorkbookControl *control, GList *name_list, gboolean need_ if (need_sep) history_menu_setup (wbcg, name_list); else { -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO MenuPos mp; history_menu_locate_separator (wbcg, &mp); (mp.pos)++; diff --git a/src/libgnumeric.c b/src/libgnumeric.c index 207e8b4d5..4e029bffa 100644 --- a/src/libgnumeric.c +++ b/src/libgnumeric.c @@ -46,7 +46,7 @@ #include #include #include -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include "bonobo-io.h" /* DO NOT include embeddable-grid.h. It causes odd depends in the non-bonobo * case */ @@ -61,7 +61,7 @@ extern gboolean EmbeddableGridFactory_init (void); #include #endif -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include #endif #include @@ -225,7 +225,7 @@ main (int argc, char *argv []) /* The statically linked in file formats */ xml_init (); stf_init (); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #ifdef GNOME2_CONVERSION_COMPLETE gnumeric_bonobo_io_init (); #endif @@ -263,7 +263,7 @@ main (int argc, char *argv []) return retval; } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #if 0 /* Activate object factories and init connections to POA */ if (!WorkbookFactory_init ()) @@ -280,7 +280,7 @@ main (int argc, char *argv []) else startup_files = NULL; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO bonobo_activate (); #endif wbc = workbook_control_gui_new (NULL, NULL); diff --git a/src/main.c b/src/main.c index 207e8b4d5..4e029bffa 100644 --- a/src/main.c +++ b/src/main.c @@ -46,7 +46,7 @@ #include #include #include -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include "bonobo-io.h" /* DO NOT include embeddable-grid.h. It causes odd depends in the non-bonobo * case */ @@ -61,7 +61,7 @@ extern gboolean EmbeddableGridFactory_init (void); #include #endif -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include #endif #include @@ -225,7 +225,7 @@ main (int argc, char *argv []) /* The statically linked in file formats */ xml_init (); stf_init (); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #ifdef GNOME2_CONVERSION_COMPLETE gnumeric_bonobo_io_init (); #endif @@ -263,7 +263,7 @@ main (int argc, char *argv []) return retval; } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #if 0 /* Activate object factories and init connections to POA */ if (!WorkbookFactory_init ()) @@ -280,7 +280,7 @@ main (int argc, char *argv []) else startup_files = NULL; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO bonobo_activate (); #endif wbc = workbook_control_gui_new (NULL, NULL); diff --git a/src/sheet-object.c b/src/sheet-object.c index baf1f7892..8b6bd9b86 100644 --- a/src/sheet-object.c +++ b/src/sheet-object.c @@ -808,7 +808,7 @@ sheet_objects_clear (Sheet const *sheet, Range const *r, GType t) } } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO /* Do NOT include the relevant header files, * they introduce automake depends in the non-bonobo build. */ @@ -822,7 +822,7 @@ sheet_object_register (void) SHEET_OBJECT_GRAPHIC_TYPE; SHEET_OBJECT_FILLED_TYPE; CELL_COMMENT_TYPE; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #ifdef GNOME2_CONVERSION_COMPLETE sheet_object_bonobo_get_type (); gnm_graph_get_type (); diff --git a/src/sheet.c b/src/sheet.c index d281e30d3..584fbbbe6 100644 --- a/src/sheet.c +++ b/src/sheet.c @@ -188,7 +188,7 @@ sheet_new (Workbook *wb, char const *name) sheet = g_new0 (Sheet, 1); sheet->priv = g_new0 (SheetPrivate, 1); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO sheet->priv->corba_server = NULL; #endif diff --git a/src/workbook-control-gui.c b/src/workbook-control-gui.c index f72add79e..f9fc3f1d2 100644 --- a/src/workbook-control-gui.c +++ b/src/workbook-control-gui.c @@ -69,7 +69,7 @@ #include "src/plugin-util.h" #include "sheet-object-image.h" -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include "sheet-object-container.h" #ifdef ENABLE_EVOLUTION #include @@ -763,7 +763,7 @@ wbcg_undo_redo_push (WorkbookControl *wbc, char const *text, gboolean is_undo) gtk_combo_stack_push_item (ur_stack (wbc, is_undo), text); } -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO static void change_menu_state (GtkWidget *menu_item, gboolean state) { @@ -877,7 +877,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, Sheet const *sheet, int flags) g_return_if_fail (wbcg != NULL); -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO if (MS_INSERT_COLS & flags) change_menu_sensitivity (wbcg->menu_item_insert_cols, sheet->priv->enable_insert_cols); @@ -947,7 +947,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, Sheet const *sheet, int flags) * we don't reset it when the label changes */ char const* label = sheet_is_frozen (sheet) ? _("Un_freeze Panes") : _("_Freeze Panes"); -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO change_menu_label (wbcg->menu_item_freeze_panes, NULL, label); #else @@ -961,7 +961,7 @@ static void wbcg_menu_state_sensitivity (WorkbookControl *wbc, gboolean sensitive) { WorkbookControlGUI *wbcg = (WorkbookControlGUI *)wbc; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO CORBA_Environment ev; #endif @@ -970,7 +970,7 @@ wbcg_menu_state_sensitivity (WorkbookControl *wbc, gboolean sensitive) return; wbcg->toolbar_is_sensitive = sensitive; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO CORBA_exception_init (&ev); bonobo_ui_component_set_prop (wbcg->uic, "/commands/MenuBar", "sensitive", sensitive ? "1" : "0", &ev); @@ -1007,7 +1007,7 @@ wbcg_undo_redo_labels (WorkbookControl *wbc, char const *undo, char const *redo) WorkbookControlGUI *wbcg = (WorkbookControlGUI *)wbc; g_return_if_fail (wbcg != NULL); -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO change_menu_label (wbcg->menu_item_undo, _("Undo"), undo); change_menu_label (wbcg->menu_item_redo, _("Redo"), redo); #else @@ -1024,7 +1024,7 @@ wbcg_menu_state_sheet_prefs (WorkbookControl *wbc, Sheet const *sheet) if (!wbcg_ui_update_begin (wbcg)) return; -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO change_menu_state (wbcg->menu_item_sheet_display_formulas, sheet->display_formulas); change_menu_state (wbcg->menu_item_sheet_hide_zero, @@ -1073,7 +1073,7 @@ wbcg_menu_state_sheet_count (WorkbookControl *wbc) /* Scrollable if there are more than 3 tabs */ gtk_notebook_set_scrollable (wbcg->notebook, sheet_count > 3); -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO change_menu_sensitivity (wbcg->menu_item_sheet_remove, multi_sheet); #else change_menu_sensitivity (wbcg, "/commands/SheetRemove", multi_sheet); @@ -1138,7 +1138,7 @@ wbcg_progress_set (CommandContext *cc, gfloat val) { WorkbookControlGUI *wbcg = WORKBOOK_CONTROL_GUI (cc); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO gtk_progress_bar_update (GTK_PROGRESS_BAR (wbcg->progress_bar), val); #else gnome_appbar_set_progress_percentage (wbcg->appbar, val); @@ -1151,7 +1151,7 @@ wbcg_progress_message_set (CommandContext *cc, gchar const *msg) WorkbookControlGUI *wbcg = WORKBOOK_CONTROL_GUI (cc); GtkProgressBar *progress; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO progress = GTK_PROGRESS_BAR (wbcg->progress_bar); #else progress = gnome_appbar_get_progress (wbcg->appbar); @@ -1380,7 +1380,7 @@ cb_file_save_as (GtkWidget *widget, WorkbookControlGUI *wbcg) gui_file_save_as (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg))); } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #ifdef ENABLE_EVOLUTION static void cb_file_send (GtkWidget *widget, WorkbookControlGUI *wbcg) @@ -2067,7 +2067,7 @@ cb_sheet_order (GtkWidget *widget, WorkbookControlGUI *wbcg) dialog_sheet_order (wbcg); } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO static gboolean toggle_util (Bonobo_UIComponent_EventType type, char const *state, gboolean *flag) @@ -2616,7 +2616,7 @@ cb_sort_descending (GtkWidget *widget, WorkbookControlGUI *wbcg) sort_by_rows (wbcg, 1); } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #ifdef GNOME2_CONVERSION_COMPLETE static void cb_launch_graph_guru (GtkWidget *widget, WorkbookControlGUI *wbcg) @@ -2671,7 +2671,7 @@ cb_insert_shaped_component (GtkWidget *widget, WorkbookControlGUI *wbcg) #endif #endif -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO /* * Hide/show some toolbar items depending on the toolbar orientation */ @@ -3515,7 +3515,7 @@ workbook_create_standard_toolbar (WorkbookControlGUI *wbcg) "pop", G_CALLBACK (cb_redo_combo), wbcg); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO gnumeric_inject_widget_into_bonoboui (wbcg, undo, "/StandardToolbar/EditUndo"); gnumeric_inject_widget_into_bonoboui (wbcg, redo, "/StandardToolbar/EditRedo"); gnumeric_inject_widget_into_bonoboui (wbcg, zoom, "/StandardToolbar/SheetZoom"); @@ -3907,7 +3907,7 @@ workbook_setup_sheets (WorkbookControlGUI *wbcg) gtk_widget_show (w); } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO static void setup_progress_bar (WorkbookControlGUI *wbcg) { @@ -4031,7 +4031,7 @@ workbook_setup_auto_calc (WorkbookControlGUI *wbcg) frame2 = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (frame2), tmp); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO gnumeric_inject_widget_into_bonoboui (wbcg, frame1, "/status/AutoExpr"); gnumeric_inject_widget_into_bonoboui (wbcg, frame2, "/status/Status"); #else @@ -4049,7 +4049,7 @@ workbook_setup_status_area (WorkbookControlGUI *wbcg) /* * Create the GnomeAppBar */ -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO setup_progress_bar (wbcg); #else wbcg->appbar = GNOME_APPBAR ( @@ -4380,12 +4380,12 @@ workbook_control_gui_init (WorkbookControlGUI *wbcg, { (char *)"text/uri-list", 0, 0 } }; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO BonoboUIContainer *ui_container; #endif GtkWidget *tmp; -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO tmp = bonobo_window_new ("Gnumeric", "Gnumeric"); #else tmp = gnome_app_new ("Gnumeric", "Gnumeric"); @@ -4399,7 +4399,7 @@ workbook_control_gui_init (WorkbookControlGUI *wbcg, workbook_setup_edit_area (wbcg); -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO /* Do BEFORE setting up UI bits in the non-bonobo case */ workbook_setup_status_area (wbcg); diff --git a/src/workbook-format-toolbar.c b/src/workbook-format-toolbar.c index 98e8d3460..9fef1301b 100644 --- a/src/workbook-format-toolbar.c +++ b/src/workbook-format-toolbar.c @@ -397,7 +397,7 @@ cb_format_dec_indent (GtkWidget *ignore, WorkbookControlGUI *wbcg) } } -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO static GnomeUIInfo workbook_format_toolbar [] = { /* Placeholder: font selector */ /* Placeholder: size selector */ @@ -591,7 +591,7 @@ disable_focus (GtkWidget *base, void *closure) GTK_WIDGET_UNSET_FLAGS (base, GTK_CAN_FOCUS); } -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO /* * Some toolbar items are too damn wide to put into the toolbar * if it is vertical. @@ -751,7 +751,7 @@ workbook_create_format_toolbar (WorkbookControlGUI *wbcg) GList *l; int i, len; -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO GtkWidget *font_button; GtkWidget *toolbar = gnumeric_toolbar_new (wbcg, workbook_format_toolbar, "FormatToolbar", 2, 0, 0); @@ -863,7 +863,7 @@ workbook_create_format_toolbar (WorkbookControlGUI *wbcg) style_color_unref (sc_auto_font); -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO gnumeric_inject_widget_into_bonoboui (wbcg, fontsel, "/FormatToolbar/FontName"); gnumeric_inject_widget_into_bonoboui (wbcg, fontsize, "/FormatToolbar/FontSize"); gnumeric_inject_widget_into_bonoboui (wbcg, border_combo, "/FormatToolbar/BorderSelector"); @@ -899,7 +899,7 @@ workbook_create_format_toolbar (WorkbookControlGUI *wbcg) #endif } -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO static void workbook_format_toolbutton_update (WorkbookControlGUI *wbcg, char const *path, gboolean state) @@ -977,7 +977,7 @@ workbook_format_halign_feedback_set (WorkbookControlGUI *wbcg, void workbook_feedback_set (WorkbookControlGUI *wbcg) { -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO GtkToolbar *toolbar; #endif MStyle *style; @@ -999,7 +999,7 @@ workbook_feedback_set (WorkbookControlGUI *wbcg) g_return_if_fail (mstyle_is_element_set (style, MSTYLE_FONT_SIZE)); g_return_if_fail (mstyle_is_element_set (style, MSTYLE_FONT_NAME)); -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO toolbar = GTK_TOOLBAR (wbcg->format_toolbar); g_return_if_fail (toolbar); diff --git a/src/workbook-object-toolbar.c b/src/workbook-object-toolbar.c index a7bfa8da9..f41421a45 100644 --- a/src/workbook-object-toolbar.c +++ b/src/workbook-object-toolbar.c @@ -32,7 +32,7 @@ #include "sheet-object-graphic.h" #include "gui-util.h" -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include #endif #include @@ -124,7 +124,7 @@ cmd_create_ellipse (GtkWidget *widget, WorkbookControlGUI *wbcg) create_object_command (wbcg, sheet_object_box_new (TRUE)); } -#ifndef ENABLE_BONOBO +#ifndef WITH_BONOBO static GnomeUIInfo workbook_object_toolbar [] = { GNOMEUIINFO_ITEM_STOCK ( N_("Label"), N_("Creates a label"), diff --git a/src/workbook-private.c b/src/workbook-private.c index cf07c1824..d04393921 100644 --- a/src/workbook-private.c +++ b/src/workbook-private.c @@ -26,7 +26,7 @@ #include "gnumeric.h" #include "workbook-private.h" -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #ifdef GNOME2_CONVERSION_COMPLETE #define WORKBOOK_PRIVATE_TYPE (workbook_private_get_type ()) #define WORKBOOK_PRIVATE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WORKBOOK_PRIVATE_TYPE, WorkbookPrivate)) @@ -119,7 +119,7 @@ workbook_bonobo_setup (WorkbookPrivate *wbp) WorkbookPrivate * workbook_private_new (void) { -#if defined(GNOME2_CONVERSION_COMPLETE) && defined(ENABLE_BONOBO) +#if defined(GNOME2_CONVERSION_COMPLETE) && defined(WITH_BONOBO) WorkbookPrivate *wbp = g_object_new (workbook_private_get_type (), NULL); workbook_bonobo_setup (Workbook *wb) #else @@ -132,7 +132,7 @@ workbook_private_new (void) void workbook_private_delete (WorkbookPrivate *wbp) { -#if defined(GNOME2_CONVERSION_COMPLETE) && defined(ENABLE_BONOBO) +#if defined(GNOME2_CONVERSION_COMPLETE) && defined(WITH_BONOBO) bonobo_object_unref (BONOBO_OBJECT (wbp)); #else g_free (wbp); diff --git a/src/workbook.c b/src/workbook.c index b1a702b16..771324970 100644 --- a/src/workbook.c +++ b/src/workbook.c @@ -36,7 +36,7 @@ #include "gnm-marshalers.h" #include "style-color.h" -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include #include "sheet-object-container.h" #include "sheet-object-bonobo.h" @@ -350,7 +350,7 @@ workbook_init (GObject *object) #if 0 workbook_corba_setup (wb); #endif -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #ifdef GNOME2_CONVERSION_COMPLETE workbook_bonobo_setup (wb); #endif diff --git a/src/xml-io.c b/src/xml-io.c index 4df818d15..fd335360b 100644 --- a/src/xml-io.c +++ b/src/xml-io.c @@ -60,7 +60,7 @@ #include #include #include -#ifdef ENABLE_BONOBO +#ifdef WITH_BONOBO #include #endif -- GitLab