Commit dd659fff authored by Michael Meeks's avatar Michael Meeks Committed by Michael Meeks

look for bonobo >= 0.20

2000-10-05  Michael Meeks  <michael@helixcode.com>

	* configure.in (gnumeric_executable): look for bonobo >= 0.20

	* src/workbook.c (setup_progress_bar): upd.

	* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): upd.

	* src/workbook.c s/BONOBO_UI_VERB/BONOBO_UI_UNSAFE_VERB/

	* src/history.c (history_menu_insert_items): upd.
	(history_menu_remove_items): upd.
parent 26d4a854
2000-10-05 Michael Meeks <michael@helixcode.com>
* configure.in (gnumeric_executable): look for bonobo >= 0.20
* src/workbook.c (setup_progress_bar): upd.
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): upd.
* src/workbook.c s/BONOBO_UI_VERB/BONOBO_UI_UNSAFE_VERB/
* src/history.c (history_menu_insert_items): upd.
(history_menu_remove_items): upd.
2000-10-05 Christophe Merlet <christophe@merlet.net>
* gnumeric.desktop.in: updated french strings.
......
2000-10-05 Michael Meeks <michael@helixcode.com>
* configure.in (gnumeric_executable): look for bonobo >= 0.20
* src/workbook.c (setup_progress_bar): upd.
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): upd.
* src/workbook.c s/BONOBO_UI_VERB/BONOBO_UI_UNSAFE_VERB/
* src/history.c (history_menu_insert_items): upd.
(history_menu_remove_items): upd.
2000-10-05 Christophe Merlet <christophe@merlet.net>
* gnumeric.desktop.in: updated french strings.
......
2000-10-05 Michael Meeks <michael@helixcode.com>
* configure.in (gnumeric_executable): look for bonobo >= 0.20
* src/workbook.c (setup_progress_bar): upd.
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): upd.
* src/workbook.c s/BONOBO_UI_VERB/BONOBO_UI_UNSAFE_VERB/
* src/history.c (history_menu_insert_items): upd.
(history_menu_remove_items): upd.
2000-10-05 Christophe Merlet <christophe@merlet.net>
* gnumeric.desktop.in: updated french strings.
......
2000-10-05 Michael Meeks <michael@helixcode.com>
* configure.in (gnumeric_executable): look for bonobo >= 0.20
* src/workbook.c (setup_progress_bar): upd.
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): upd.
* src/workbook.c s/BONOBO_UI_VERB/BONOBO_UI_UNSAFE_VERB/
* src/history.c (history_menu_insert_items): upd.
(history_menu_remove_items): upd.
2000-10-05 Christophe Merlet <christophe@merlet.net>
* gnumeric.desktop.in: updated french strings.
......
2000-10-05 Michael Meeks <michael@helixcode.com>
* configure.in (gnumeric_executable): look for bonobo >= 0.20
* src/workbook.c (setup_progress_bar): upd.
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): upd.
* src/workbook.c s/BONOBO_UI_VERB/BONOBO_UI_UNSAFE_VERB/
* src/history.c (history_menu_insert_items): upd.
(history_menu_remove_items): upd.
2000-10-05 Christophe Merlet <christophe@merlet.net>
* gnumeric.desktop.in: updated french strings.
......
2000-10-05 Michael Meeks <michael@helixcode.com>
* configure.in (gnumeric_executable): look for bonobo >= 0.20
* src/workbook.c (setup_progress_bar): upd.
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): upd.
* src/workbook.c s/BONOBO_UI_VERB/BONOBO_UI_UNSAFE_VERB/
* src/history.c (history_menu_insert_items): upd.
(history_menu_remove_items): upd.
2000-10-05 Christophe Merlet <christophe@merlet.net>
* gnumeric.desktop.in: updated french strings.
......
2000-10-05 Michael Meeks <michael@helixcode.com>
* configure.in (gnumeric_executable): look for bonobo >= 0.20
* src/workbook.c (setup_progress_bar): upd.
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): upd.
* src/workbook.c s/BONOBO_UI_VERB/BONOBO_UI_UNSAFE_VERB/
* src/history.c (history_menu_insert_items): upd.
(history_menu_remove_items): upd.
2000-10-05 Christophe Merlet <christophe@merlet.net>
* gnumeric.desktop.in: updated french strings.
......
......@@ -204,10 +204,10 @@ AC_ARG_WITH(bonobo,
gnumeric_executable=gnumeric
AC_SUBST(gnumeric_executable)
if $try_bonobo; then
AC_MSG_CHECKING(for Bonobo == 0.19)
AC_MSG_CHECKING(for Bonobo >= 0.20)
vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \
awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
if test "$vers" -eq 19; then
if test "$vers" -ge 20; then
AC_MSG_RESULT(found)
AC_DEFINE(ENABLE_BONOBO)
have_bonobo=true
......
......@@ -750,12 +750,11 @@ void
gnumeric_inject_widget_into_bonoboui (Workbook *wb, GtkWidget *widget, char const *path)
{
BonoboControl *control;
Bonobo_UIContainer container = bonobo_ui_compat_get_container (wb->priv->uih);
gtk_widget_show_all (widget);
control = bonobo_control_new (widget);
bonobo_ui_container_object_set (
container, path,
bonobo_ui_component_object_set (
BONOBO_UI_COMPONENT (wb->priv->uih), path,
bonobo_object_corba_objref (BONOBO_OBJECT (control)),
NULL);
}
......
......@@ -750,12 +750,11 @@ void
gnumeric_inject_widget_into_bonoboui (Workbook *wb, GtkWidget *widget, char const *path)
{
BonoboControl *control;
Bonobo_UIContainer container = bonobo_ui_compat_get_container (wb->priv->uih);
gtk_widget_show_all (widget);
control = bonobo_control_new (widget);
bonobo_ui_container_object_set (
container, path,
bonobo_ui_component_object_set (
BONOBO_UI_COMPONENT (wb->priv->uih), path,
bonobo_object_corba_objref (BONOBO_OBJECT (control)),
NULL);
}
......
......@@ -204,8 +204,7 @@ history_menu_insert_items (Workbook *wb, GList *name_list)
label = history_item_label (l->data, accel_number);
str = g_strdup_printf ("<menuitem name=\"FileHistory%d\" label=\"%s\"/>\n",
accel_number, label);
bonobo_ui_component_set (bonobo_ui_compat_get_component (wb->priv->uih),
bonobo_ui_compat_get_container (wb->priv->uih),
bonobo_ui_component_set (BONOBO_UI_COMPONENT (wb->priv->uih),
"/menu/File/FileHistory",
str, &ev);
g_free (str);
......@@ -246,9 +245,7 @@ history_menu_remove_items (Workbook *wb, GList *name_list)
char *path;
path = g_strdup_printf ("/menu/File/FileHistory%d", accel_number);
bonobo_ui_component_rm (bonobo_ui_compat_get_component (wb->priv->uih),
bonobo_ui_compat_get_container (wb->priv->uih),
path, &ev);
bonobo_ui_component_rm (BONOBO_UI_COMPONENT (wb->priv->uih), path, &ev);
g_free (path);
}
CORBA_exception_free (&ev);
......
......@@ -389,17 +389,17 @@ static GnomeUIInfo workbook_format_toolbar [] = {
};
#else
static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB ("FontBold", &bold_cmd),
BONOBO_UI_VERB ("FontItalic", &italic_cmd),
BONOBO_UI_VERB ("FontUnderline", &underline_cmd),
BONOBO_UI_VERB ("AlignLeft", &left_align_cmd),
BONOBO_UI_VERB ("AlignCenter", &center_cmd),
BONOBO_UI_VERB ("AlignRight", &right_align_cmd),
BONOBO_UI_VERB ("FormatAsMoney", &workbook_cmd_format_as_money),
BONOBO_UI_VERB ("FormatAsPercent", &workbook_cmd_format_as_percent),
BONOBO_UI_VERB ("FormatWithThousands", &workbook_cmd_format_add_thousands),
BONOBO_UI_VERB ("FormatIncreasePrecision", &workbook_cmd_format_add_decimals),
BONOBO_UI_VERB ("FormatDecreasePrecision", &workbook_cmd_format_remove_decimals),
BONOBO_UI_UNSAFE_VERB ("FontBold", &bold_cmd),
BONOBO_UI_UNSAFE_VERB ("FontItalic", &italic_cmd),
BONOBO_UI_UNSAFE_VERB ("FontUnderline", &underline_cmd),
BONOBO_UI_UNSAFE_VERB ("AlignLeft", &left_align_cmd),
BONOBO_UI_UNSAFE_VERB ("AlignCenter", &center_cmd),
BONOBO_UI_UNSAFE_VERB ("AlignRight", &right_align_cmd),
BONOBO_UI_UNSAFE_VERB ("FormatAsMoney", &workbook_cmd_format_as_money),
BONOBO_UI_UNSAFE_VERB ("FormatAsPercent", &workbook_cmd_format_as_percent),
BONOBO_UI_UNSAFE_VERB ("FormatWithThousands", &workbook_cmd_format_add_thousands),
BONOBO_UI_UNSAFE_VERB ("FormatIncreasePrecision", &workbook_cmd_format_add_decimals),
BONOBO_UI_UNSAFE_VERB ("FormatDecreasePrecision", &workbook_cmd_format_remove_decimals),
BONOBO_UI_VERB_END
};
#endif
......@@ -757,7 +757,7 @@ workbook_format_toolbutton_update (Workbook const *wb, char const * const path,
if (hack)
return;
hack = TRUE;
bonobo_ui_container_set_prop (bonobo_ui_compat_get_container (wb->priv->uih),
bonobo_ui_component_set_prop (BONOBO_UI_COMPONENT (wb->priv->uih),
path, "state", state ? "1" : "0", NULL);
hack = FALSE;
}
......
......@@ -166,17 +166,17 @@ static GnomeUIInfo workbook_object_toolbar [] = {
#else
static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB ("CreateLabel", cmd_create_label),
BONOBO_UI_VERB ("CreateFrame", cmd_create_frame),
BONOBO_UI_VERB ("CreateButton", cmd_create_button),
BONOBO_UI_VERB ("CreateCheckbox", cmd_create_checkbox),
BONOBO_UI_VERB ("CreateRadiobutton", cmd_create_radiobutton),
BONOBO_UI_VERB ("CreateList", cmd_create_list),
BONOBO_UI_VERB ("CreateCombobox", cmd_create_combobox),
BONOBO_UI_VERB ("CreateLine", cmd_create_line),
BONOBO_UI_VERB ("CreateArrow", cmd_create_arrow),
BONOBO_UI_VERB ("CreateRectangle", cmd_create_rectangle),
BONOBO_UI_VERB ("CreateEllipse", cmd_create_ellipse),
BONOBO_UI_UNSAFE_VERB ("CreateLabel", cmd_create_label),
BONOBO_UI_UNSAFE_VERB ("CreateFrame", cmd_create_frame),
BONOBO_UI_UNSAFE_VERB ("CreateButton", cmd_create_button),
BONOBO_UI_UNSAFE_VERB ("CreateCheckbox", cmd_create_checkbox),
BONOBO_UI_UNSAFE_VERB ("CreateRadiobutton", cmd_create_radiobutton),
BONOBO_UI_UNSAFE_VERB ("CreateList", cmd_create_list),
BONOBO_UI_UNSAFE_VERB ("CreateCombobox", cmd_create_combobox),
BONOBO_UI_UNSAFE_VERB ("CreateLine", cmd_create_line),
BONOBO_UI_UNSAFE_VERB ("CreateArrow", cmd_create_arrow),
BONOBO_UI_UNSAFE_VERB ("CreateRectangle", cmd_create_rectangle),
BONOBO_UI_UNSAFE_VERB ("CreateEllipse", cmd_create_ellipse),
BONOBO_UI_VERB_END
};
#endif
......
......@@ -27,7 +27,7 @@ workbook_view_set_paste_special_state (Workbook *wb, gboolean enable)
gtk_widget_set_sensitive (
wb->priv->menu_item_paste_special, enable);
#else
bonobo_ui_container_set_prop (bonobo_ui_compat_get_container (wb->priv->uih),
bonobo_ui_component_set_prop (BONOBO_UI_COMPONENT (wb->priv->uih),
"/commands/EditPasteSpecial",
"sensitive", enable ? "1" : "0", NULL);
#endif
......@@ -72,10 +72,10 @@ change_menu_label (
#else
CORBA_exception_init (&ev);
bonobo_ui_container_set_prop (bonobo_ui_compat_get_container (wb->priv->uih),
bonobo_ui_component_set_prop (BONOBO_UI_COMPONENT (wb->priv->uih),
verb_path,
"sensitive", sensitive ? "1" : "0", &ev);
bonobo_ui_container_set_prop (bonobo_ui_compat_get_container (wb->priv->uih),
bonobo_ui_component_set_prop (BONOBO_UI_COMPONENT (wb->priv->uih),
menu_path, "label", text, &ev);
CORBA_exception_free (&ev);
#endif
......
......@@ -1131,115 +1131,115 @@ sort_descend_cmd (GtkWidget *widget, Workbook *wb)
static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB ("FileNew", new_cmd),
BONOBO_UI_VERB ("FileOpen", file_open_cmd),
BONOBO_UI_VERB ("FileImport", file_import_cmd),
BONOBO_UI_VERB ("FileSave", file_save_cmd),
BONOBO_UI_VERB ("FileSaveAs", file_save_as_cmd),
BONOBO_UI_VERB ("FileSummary", summary_cmd),
BONOBO_UI_VERB ("FilePrint", file_print_cmd),
BONOBO_UI_VERB ("FilePrintSetup", print_setup_cmd),
BONOBO_UI_VERB ("FilePrintPreview", file_print_preview_cmd),
BONOBO_UI_VERB ("FileClose", close_cmd),
BONOBO_UI_VERB ("FileExit", quit_cmd),
BONOBO_UI_VERB ("EditClearAll", clear_all_cmd),
BONOBO_UI_VERB ("EditClearFormats", clear_formats_cmd),
BONOBO_UI_VERB ("EditClearComments", clear_comments_cmd),
BONOBO_UI_VERB ("EditClearContent", clear_content_cmd),
BONOBO_UI_VERB ("EditSelectAll", cb_edit_select_all),
BONOBO_UI_VERB ("EditSelectRow", cb_edit_select_row),
BONOBO_UI_VERB ("EditSelectColumn", cb_edit_select_col),
BONOBO_UI_VERB ("EditSelectArray", cb_edit_select_array),
BONOBO_UI_VERB ("EditSelectDepends", cb_edit_select_depends),
BONOBO_UI_VERB ("EditUndo", undo_cmd),
BONOBO_UI_VERB ("EditRedo", redo_cmd),
BONOBO_UI_VERB ("EditCut", cut_cmd),
BONOBO_UI_VERB ("EditCopy", copy_cmd),
BONOBO_UI_VERB ("EditPaste", paste_cmd),
BONOBO_UI_VERB ("EditPasteSpecial", paste_special_cmd),
BONOBO_UI_VERB ("EditDelete", delete_cells_cmd),
BONOBO_UI_VERB ("EditDeleteSheet", delete_sheet_cmd),
BONOBO_UI_VERB ("EditGoto", goto_cell_cmd),
BONOBO_UI_VERB ("EditRecalc", recalc_cmd),
BONOBO_UI_VERB ("ViewZoom", zoom_cmd),
BONOBO_UI_VERB ("InsertCurrentDate", insert_current_date_cmd),
BONOBO_UI_VERB ("InsertCurrentTime", insert_current_time_cmd),
BONOBO_UI_VERB ("EditNames", cb_edit_named_expr),
BONOBO_UI_VERB ("InsertSheet", insert_sheet_cmd),
BONOBO_UI_VERB ("InsertRows", insert_rows_cmd),
BONOBO_UI_VERB ("InsertColumns", insert_cols_cmd),
BONOBO_UI_VERB ("InsertCells", insert_cells_cmd),
BONOBO_UI_VERB ("InsertObject", create_bonobo_object),
BONOBO_UI_VERB ("InsertComment", workbook_edit_comment),
BONOBO_UI_UNSAFE_VERB ("FileNew", new_cmd),
BONOBO_UI_UNSAFE_VERB ("FileOpen", file_open_cmd),
BONOBO_UI_UNSAFE_VERB ("FileImport", file_import_cmd),
BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cmd),
BONOBO_UI_UNSAFE_VERB ("FileSaveAs", file_save_as_cmd),
BONOBO_UI_UNSAFE_VERB ("FileSummary", summary_cmd),
BONOBO_UI_UNSAFE_VERB ("FilePrint", file_print_cmd),
BONOBO_UI_UNSAFE_VERB ("FilePrintSetup", print_setup_cmd),
BONOBO_UI_UNSAFE_VERB ("FilePrintPreview", file_print_preview_cmd),
BONOBO_UI_UNSAFE_VERB ("FileClose", close_cmd),
BONOBO_UI_UNSAFE_VERB ("FileExit", quit_cmd),
BONOBO_UI_UNSAFE_VERB ("EditClearAll", clear_all_cmd),
BONOBO_UI_UNSAFE_VERB ("EditClearFormats", clear_formats_cmd),
BONOBO_UI_UNSAFE_VERB ("EditClearComments", clear_comments_cmd),
BONOBO_UI_UNSAFE_VERB ("EditClearContent", clear_content_cmd),
BONOBO_UI_UNSAFE_VERB ("EditSelectAll", cb_edit_select_all),
BONOBO_UI_UNSAFE_VERB ("EditSelectRow", cb_edit_select_row),
BONOBO_UI_UNSAFE_VERB ("EditSelectColumn", cb_edit_select_col),
BONOBO_UI_UNSAFE_VERB ("EditSelectArray", cb_edit_select_array),
BONOBO_UI_UNSAFE_VERB ("EditSelectDepends", cb_edit_select_depends),
BONOBO_UI_UNSAFE_VERB ("EditUndo", undo_cmd),
BONOBO_UI_UNSAFE_VERB ("EditRedo", redo_cmd),
BONOBO_UI_UNSAFE_VERB ("EditCut", cut_cmd),
BONOBO_UI_UNSAFE_VERB ("EditCopy", copy_cmd),
BONOBO_UI_UNSAFE_VERB ("EditPaste", paste_cmd),
BONOBO_UI_UNSAFE_VERB ("EditPasteSpecial", paste_special_cmd),
BONOBO_UI_UNSAFE_VERB ("EditDelete", delete_cells_cmd),
BONOBO_UI_UNSAFE_VERB ("EditDeleteSheet", delete_sheet_cmd),
BONOBO_UI_UNSAFE_VERB ("EditGoto", goto_cell_cmd),
BONOBO_UI_UNSAFE_VERB ("EditRecalc", recalc_cmd),
BONOBO_UI_UNSAFE_VERB ("ViewZoom", zoom_cmd),
BONOBO_UI_UNSAFE_VERB ("InsertCurrentDate", insert_current_date_cmd),
BONOBO_UI_UNSAFE_VERB ("InsertCurrentTime", insert_current_time_cmd),
BONOBO_UI_UNSAFE_VERB ("EditNames", cb_edit_named_expr),
BONOBO_UI_UNSAFE_VERB ("InsertSheet", insert_sheet_cmd),
BONOBO_UI_UNSAFE_VERB ("InsertRows", insert_rows_cmd),
BONOBO_UI_UNSAFE_VERB ("InsertColumns", insert_cols_cmd),
BONOBO_UI_UNSAFE_VERB ("InsertCells", insert_cells_cmd),
BONOBO_UI_UNSAFE_VERB ("InsertObject", create_bonobo_object),
BONOBO_UI_UNSAFE_VERB ("InsertComment", workbook_edit_comment),
BONOBO_UI_VERB ("ColumnAutoSize",
BONOBO_UI_UNSAFE_VERB ("ColumnAutoSize",
workbook_cmd_format_column_auto_fit),
BONOBO_UI_VERB ("ColumnSize",
BONOBO_UI_UNSAFE_VERB ("ColumnSize",
sheet_dialog_set_column_width),
BONOBO_UI_VERB ("ColumnHide",
BONOBO_UI_UNSAFE_VERB ("ColumnHide",
workbook_cmd_format_column_hide),
BONOBO_UI_VERB ("ColumnUnhide",
BONOBO_UI_UNSAFE_VERB ("ColumnUnhide",
workbook_cmd_format_column_unhide),
BONOBO_UI_VERB ("ColumnDefaultSize",
BONOBO_UI_UNSAFE_VERB ("ColumnDefaultSize",
workbook_cmd_format_column_std_width),
BONOBO_UI_VERB ("RowAutoSize",
BONOBO_UI_UNSAFE_VERB ("RowAutoSize",
workbook_cmd_format_row_auto_fit),
BONOBO_UI_VERB ("RowSize",
BONOBO_UI_UNSAFE_VERB ("RowSize",
sheet_dialog_set_row_height),
BONOBO_UI_VERB ("RowHide",
BONOBO_UI_UNSAFE_VERB ("RowHide",
workbook_cmd_format_row_hide),
BONOBO_UI_VERB ("RowUnhide",
BONOBO_UI_UNSAFE_VERB ("RowUnhide",
workbook_cmd_format_row_unhide),
BONOBO_UI_VERB ("RowDefaultSize",
BONOBO_UI_UNSAFE_VERB ("RowDefaultSize",
workbook_cmd_format_row_std_height),
BONOBO_UI_VERB ("SheetChangeName",
BONOBO_UI_UNSAFE_VERB ("SheetChangeName",
workbook_cmd_format_sheet_change_name),
BONOBO_UI_VERB ("SheetReorder",
BONOBO_UI_UNSAFE_VERB ("SheetReorder",
sheet_order_cmd),
BONOBO_UI_VERB ("SheetDisplayFormulas",
BONOBO_UI_UNSAFE_VERB ("SheetDisplayFormulas",
cb_sheet_pref_display_formulas),
BONOBO_UI_VERB ("SheetHideZeros",
BONOBO_UI_UNSAFE_VERB ("SheetHideZeros",
cb_sheet_pref_hide_zeros),
BONOBO_UI_VERB ("SheetHideGridlines",
BONOBO_UI_UNSAFE_VERB ("SheetHideGridlines",
cb_sheet_pref_hide_grid_lines),
BONOBO_UI_VERB ("SheetHideColHeader",
BONOBO_UI_UNSAFE_VERB ("SheetHideColHeader",
cb_sheet_pref_hide_col_header),
BONOBO_UI_VERB ("SheetHideRowHeader",
BONOBO_UI_UNSAFE_VERB ("SheetHideRowHeader",
cb_sheet_pref_hide_row_header),
BONOBO_UI_VERB ("FormatCells", format_cells_cmd),
BONOBO_UI_VERB ("FormatAuto", autoformat_cmd),
BONOBO_UI_VERB ("FormatWorkbook", workbook_attr_cmd),
BONOBO_UI_UNSAFE_VERB ("FormatCells", format_cells_cmd),
BONOBO_UI_UNSAFE_VERB ("FormatAuto", autoformat_cmd),
BONOBO_UI_UNSAFE_VERB ("FormatWorkbook", workbook_attr_cmd),
BONOBO_UI_VERB ("ToolsPlugins", plugins_cmd),
BONOBO_UI_VERB ("ToolsAutoCorrect", autocorrect_cmd),
BONOBO_UI_VERB ("ToolsAutoSave", autosave_cmd),
BONOBO_UI_VERB ("ToolsGoalSeek", goal_seek_cmd),
BONOBO_UI_VERB ("ToolsSolver", solver_cmd),
BONOBO_UI_VERB ("ToolsDataAnalysis", data_analysis_cmd),
BONOBO_UI_UNSAFE_VERB ("ToolsPlugins", plugins_cmd),
BONOBO_UI_UNSAFE_VERB ("ToolsAutoCorrect", autocorrect_cmd),
BONOBO_UI_UNSAFE_VERB ("ToolsAutoSave", autosave_cmd),
BONOBO_UI_UNSAFE_VERB ("ToolsGoalSeek", goal_seek_cmd),
BONOBO_UI_UNSAFE_VERB ("ToolsSolver", solver_cmd),
BONOBO_UI_UNSAFE_VERB ("ToolsDataAnalysis", data_analysis_cmd),
BONOBO_UI_VERB ("DataSort", sort_cells_cmd),
BONOBO_UI_VERB ("DataFilter", advanced_filter_cmd),
BONOBO_UI_UNSAFE_VERB ("DataSort", sort_cells_cmd),
BONOBO_UI_UNSAFE_VERB ("DataFilter", advanced_filter_cmd),
BONOBO_UI_VERB ("AutoSum", autosum_cmd),
BONOBO_UI_VERB ("FunctionGuru", formula_guru),
BONOBO_UI_VERB ("SortAscending", sort_ascend_cmd),
BONOBO_UI_VERB ("SortDescending", sort_descend_cmd),
BONOBO_UI_VERB ("GraphGuru", launch_graph_guru),
BONOBO_UI_VERB ("InsertComponent", verb_insert_component),
BONOBO_UI_VERB ("InsertShapedComponent", verb_insert_shaped_component),
BONOBO_UI_UNSAFE_VERB ("AutoSum", autosum_cmd),
BONOBO_UI_UNSAFE_VERB ("FunctionGuru", formula_guru),
BONOBO_UI_UNSAFE_VERB ("SortAscending", sort_ascend_cmd),
BONOBO_UI_UNSAFE_VERB ("SortDescending", sort_descend_cmd),
BONOBO_UI_UNSAFE_VERB ("GraphGuru", launch_graph_guru),
BONOBO_UI_UNSAFE_VERB ("InsertComponent", verb_insert_component),
BONOBO_UI_UNSAFE_VERB ("InsertShapedComponent", verb_insert_shaped_component),
BONOBO_UI_VERB ("HelpAbout", about_cmd),
BONOBO_UI_UNSAFE_VERB ("HelpAbout", about_cmd),
BONOBO_UI_VERB ("DebugDumpXml", verb_debug_dump_xml),
BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", verb_debug_dump_xml),
BONOBO_UI_VERB_END
};
......@@ -2236,8 +2236,8 @@ workbook_setup_auto_calc (Workbook *wb)
control = bonobo_control_new (frame);
g_return_if_fail (control != NULL);
bonobo_ui_container_object_set (
bonobo_ui_compat_get_container (wb->priv->uih),
bonobo_ui_component_object_set (
BONOBO_UI_COMPONENT (wb->priv->uih),
"/status/AutoExpr",
bonobo_object_corba_objref (BONOBO_OBJECT (control)),
NULL);
......@@ -2272,8 +2272,8 @@ setup_progress_bar (WorkbookPrivate *priv)
control = bonobo_control_new (priv->progress_bar);
g_return_if_fail (control != NULL);
bonobo_ui_container_object_set (
bonobo_ui_compat_get_container (priv->uih),
bonobo_ui_component_object_set (
BONOBO_UI_COMPONENT (priv->uih),
"/status/Progress",
bonobo_object_corba_objref (BONOBO_OBJECT (control)),
NULL);
......@@ -2835,14 +2835,12 @@ workbook_new (void)
{
BonoboUIComponent *component =
bonobo_ui_compat_get_component (wb->priv->uih);
Bonobo_UIContainer container =
bonobo_ui_compat_get_container (wb->priv->uih);
bonobo_ui_component_add_verb_list_with_data (
component, verbs, wb);
bonobo_ui_util_set_ui (
component, container, GNOME_DATADIR,
component, GNOME_DATADIR,
"gnumeric.xml", "gnumeric");
}
/* Do after setting up UI bits in the bonobo case */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment