Commit da306941 authored by Jody Goldberg's avatar Jody Goldberg

dialogs compile after 1st phase of wbc-gtk / wbcg merge

svn path=/trunk/; revision=15738
parent cac51992
......@@ -31,7 +31,6 @@
#include "value.h"
#include "gui-util.h"
#include "workbook-control-gui.h"
#include "selection.h"
#include <widgets/gnm-dao.h>
......
......@@ -36,7 +36,7 @@
#include <tool-dialogs.h>
#include <dao-gui-utils.h>
#include <value.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <glade/glade.h>
#include <gtk/gtklabel.h>
......
......@@ -32,7 +32,7 @@
#include <workbook.h>
#include <workbook-control.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <gui-util.h>
#include <parse-util.h>
......
......@@ -37,7 +37,7 @@
#include <auto-correct.h>
#include <gui-util.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <glade/glade.h>
#include <gsf/gsf-impl-utils.h>
......
......@@ -29,7 +29,7 @@
#include <commands.h>
#include <workbook-control.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <sheet.h>
#include <value.h>
#include <sheet-filter.h>
......
......@@ -40,7 +40,7 @@
#include <command-context.h>
#include <workbook-control.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <commands.h>
#include <selection.h>
#include <ranges.h>
......
......@@ -26,9 +26,11 @@
#include <gnumeric.h>
#include "dialogs.h"
#include "help.h"
#include <workbook.h>
#include <workbook-control.h>
#include <wbc-gtk.h>
#include <gui-util.h>
#include <goffice/app/go-doc.h>
#include <glib/gi18n-lib.h>
......
......@@ -28,7 +28,7 @@
#include <sheet.h>
#include <cell.h>
#include <sheet-object-cell-comment.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <ranges.h>
#include <commands.h>
......
......@@ -46,7 +46,7 @@
#include <application.h>
#include <validation.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <commands.h>
#include <mathfunc.h>
......
......@@ -39,7 +39,7 @@
#include <sort.h>
#include <sheet.h>
#include <sheet-view.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <gnumeric-gconf.h>
#include <widgets/gnumeric-cell-renderer-toggle.h>
#include <widgets/gnumeric-expr-entry.h>
......
......@@ -30,7 +30,7 @@
#include <commands.h>
#include <workbook-control.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <glade/glade.h>
#include <gtk/gtkframe.h>
......
......@@ -31,7 +31,7 @@
#include <commands.h>
#include <workbook-control.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <sheet.h>
#include <sheet-view.h>
#include <application.h>
......
......@@ -38,7 +38,7 @@
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <widgets/gnm-dao.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <dao-gui-utils.h>
#include <tools/dao.h>
#include <gtk/gtkcombobox.h>
......
......@@ -30,7 +30,7 @@
#include <sheet-view.h>
#include <workbook.h>
#include <workbook-control.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <gui-util.h>
#include <parse-util.h>
#include <commands.h>
......
......@@ -36,7 +36,7 @@
#include <sheet-view.h>
#include <workbook.h>
#include <workbook-control.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <gui-util.h>
#include <parse-util.h>
......
......@@ -33,7 +33,7 @@
#include <commands.h>
#include <ranges.h>
#include <cmd-edit.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <command-context.h>
#include <glade/glade.h>
......
......@@ -25,7 +25,7 @@
#include <workbook.h>
#include <workbook-control.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <gui-util.h>
#include <parse-util.h>
......
......@@ -37,7 +37,7 @@
#include <commands.h>
#include <ranges.h>
#include <cmd-edit.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <command-context.h>
#include <value.h>
#include <selection.h>
......
......@@ -34,7 +34,7 @@
#include <workbook.h>
#include <sheet.h>
#include <sheet-view.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-control.h>
#include <cell.h>
#include <expr.h>
......
......@@ -33,7 +33,7 @@
#include <func.h>
#include <workbook.h>
#include <str.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <application.h>
#include <gnumeric-gconf.h>
......
......@@ -41,7 +41,7 @@
#include <parse-util.h>
#include <workbook.h>
#include <workbook-control.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <goal-seek.h>
#include <mathfunc.h>
......
......@@ -37,7 +37,7 @@
#include <sheet.h>
#include <workbook-view.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <gtk/gtktreestore.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
......
......@@ -36,7 +36,7 @@
#include <sheet-view.h>
#include <sheet-style.h>
#include <value.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <goffice/utils/go-file.h>
#include <gtk/gtkbox.h>
......
......@@ -33,7 +33,7 @@
#include <commands.h>
#include <ranges.h>
#include <cmd-edit.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <command-context.h>
#include <glade/glade.h>
......
......@@ -30,8 +30,7 @@
#include "help.h"
#include <gui-util.h>
#include <workbook-control-gui.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <workbook.h>
#include <sheet.h>
......
......@@ -33,7 +33,7 @@
#include <sheet-view.h>
#include <workbook.h>
#include <workbook-control.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <gui-util.h>
#include <parse-util.h>
......
......@@ -25,8 +25,7 @@
#include <gnumeric.h>
#include "dialogs.h"
#include <workbook-edit.h>
#include <workbook-control-gui.h>
#include <wbc-gtk.h>
#include <gui-util.h>
#include <clipboard.h>
#include <dependent.h>
......
......@@ -26,7 +26,7 @@
#include <commands.h>
#include <workbook-control.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <sheet.h>
#include <sheet-view.h>
#include <workbook-cmd-format.h>
......
......@@ -31,6 +31,7 @@
#include "dialogs.h"
#include "help.h"
#include <application.h>
#include <wbc-gtk.h>
#include <gnumeric-gconf.h>
#include <gutils.h>
#include <gui-util.h>
......
......@@ -33,6 +33,8 @@
#include "value.h"
#include <gnm-format.h>
#include "workbook.h"
#include "workbook-control.h"
#include "wbc-gtk.h"
#include "number-match.h"
#include "widgets/widget-font-selector.h"
#include "widgets/gnumeric-cell-renderer-text.h"
......
......@@ -36,7 +36,7 @@
#include <ranges.h>
#include <sheet.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <style.h>
#include <gnumeric-gconf.h>
......@@ -1672,7 +1672,8 @@ cb_do_print_preview (PrinterSetupState *state)
fetch_settings (state);
old_pi = state->sheet->print_info;
state->sheet->print_info = state->pi;
gnm_print_sheet (state->wbcg, state->sheet, TRUE, PRINT_ACTIVE_SHEET, NULL);
gnm_print_sheet (WORKBOOK_CONTROL (state->wbcg),
state->sheet, TRUE, PRINT_ACTIVE_SHEET, NULL);
state->sheet->print_info = old_pi;
}
......@@ -1703,12 +1704,9 @@ cb_do_print_ok (PrinterSetupState *state)
static void
cb_do_print (PrinterSetupState *state)
{
WBCGtk *wbcg = state->wbcg;
Sheet *sheet = state->sheet;
cb_do_print_ok (state);
gnm_print_sheet (wbcg, sheet, FALSE, PRINT_ACTIVE_SHEET, NULL);
gnm_print_sheet (WORKBOOK_CONTROL (state->wbcg),
state->sheet, FALSE, PRINT_ACTIVE_SHEET, NULL);
}
static void
......@@ -1919,13 +1917,6 @@ do_fetch_scale (PrinterSetupState *state)
}
}
static double
get_margin (UnitInfo *ui)
{
return ui->value;
}
/**
* Header and footer are stored with Excel semantics, but displayed with
* more natural semantics. In Excel, both top margin and header are measured
......
......@@ -21,19 +21,23 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include <gui-file.h>
#include <gui-util.h>
#include <workbook.h>
#include <wbc-gtk.h>
#include <gui-clipboard.h>
#include <application.h>
#include <gtk/gtk.h>
#include <string.h>
#include <goffice/utils/go-glib-extras.h>
#include <goffice/utils/go-file.h>
#include <goffice/app/go-doc.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
enum {
RESPONSE_ALL = 1,
......@@ -324,8 +328,7 @@ show_quit_dialog (GList *dirty, WBCGtk *wbcg)
if (save) {
gboolean ok;
Workbook *wb = WORKBOOK (doc);
WBCGtk *wbcg2 = wbcg_find_for_workbook
(wb, wbcg, NULL, NULL);
WBCGtk *wbcg2 = wbcg_find_for_workbook (wb, wbcg, NULL, NULL);
ok = wbcg2 && gui_file_save (wbcg2, wb_control_view (WORKBOOK_CONTROL (wbcg2)));
if (!ok)
......
......@@ -32,7 +32,7 @@
#include <workbook.h>
#include <workbook-control.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <gui-util.h>
#include <parse-util.h>
......
......@@ -24,6 +24,7 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include <wbc-gtk.h>
#include <gui-file.h>
#include <gtk/gtk.h>
#include <string.h>
......
......@@ -31,7 +31,7 @@
#include <commands.h>
#include <workbook-control.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <sheet.h>
#include <sheet-view.h>
#include <application.h>
......
......@@ -31,7 +31,7 @@
#include <commands.h>
#include <workbook-control.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <sheet.h>
#include <dao-gui-utils.h>
#include <position.h>
......
......@@ -29,7 +29,7 @@
#include <gui-util.h>
#include <search.h>
#include <widgets/gnumeric-expr-entry.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <selection.h>
#include <glade/glade.h>
......
......@@ -36,7 +36,7 @@
#include <cell.h>
#include <value.h>
#include <parse-util.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <sheet-object-cell-comment.h>
#include <selection.h>
......
......@@ -32,8 +32,7 @@
#include "help.h"
#include <gui-util.h>
#include <workbook-control-gui.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-view.h>
#include <workbook.h>
#include <sheet.h>
......
......@@ -36,7 +36,7 @@
#include <tool-dialogs.h>
#include <dao-gui-utils.h>
#include <value.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <commands.h>
#include <selection.h>
......
......@@ -32,7 +32,7 @@
#include <tool-dialogs.h>
#include <dao-gui-utils.h>
#include <value.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <glade/glade.h>
#include <widgets/gnumeric-expr-entry.h>
......
......@@ -31,7 +31,7 @@
#include <sheet-object-widget.h>
#include <workbook.h>
#include <workbook-control.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <gui-util.h>
#include <parse-util.h>
#include <commands.h>
......
......@@ -27,7 +27,7 @@
#include "gui-gnumeric.h"
#include "gui-util.h"
#include "dialogs/help.h"
#include "workbook-edit.h"
#include "wbc-gtk.h"
#include "commands.h"
#include "sheet-object.h"
#include <goffice/app/go-cmd-context.h>
......
......@@ -35,7 +35,7 @@
#include <value.h>
#include <cell.h>
#include <sheet.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook.h>
#include <parse-util.h>
#include <ranges.h>
......
......@@ -26,6 +26,8 @@
#include <command-context.h>
#include <workbook.h>
#include <workbook-control.h>
#include <wbc-gtk.h>
#include <sheet.h>
#include <gui-util.h>
#include <goffice/gtk/go-charmap-sel.h>
......
......@@ -26,6 +26,7 @@
#include "dialog-stf.h"
#include <gnm-format.h>
#include <workbook.h>
#include <workbook-control.h>
#include <gui-util.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
......
......@@ -25,6 +25,7 @@
#include "dialog-stf.h"
#include <gnm-format.h>
#include <wbc-gtk.h>
#include <command-context.h>
#include <gui-util.h>
#include <sheet-style.h>
......
......@@ -32,7 +32,7 @@
#include <glade/glade.h>
#include <widgets/gnumeric-expr-entry.h>
#include <tools/tabulate.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include "ranges.h"
#include "value.h"
#include "sheet.h"
......
......@@ -19,16 +19,17 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "dialogs.h"
#include "help.h"
#include "application.h"
#include <glade/glade.h>
#include <gui-util.h>
#include <workbook-control-gui.h>
#include <wbc-gtk.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkbox.h>
#include <glib/gi18n-lib.h>
#define VIEW_DIALOG_KEY "view-dialog"
......
......@@ -28,7 +28,7 @@
#include <gui-util.h>
#include <workbook-view.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <workbook-priv.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtknotebook.h>
......
......@@ -29,7 +29,7 @@
#include <commands.h>
#include <workbook-control.h>
#include <workbook.h>
#include <workbook-edit.h>
#include <wbc-gtk.h>
#include <sheet.h>
#include <glade/glade.h>
......
#ifndef GNUMERIC_DIALOGS_H
#define GNUMERIC_DIALOGS_H
#include "gnumeric.h"
#include "workbook-control-gui.h"
#include "gui-gnumeric.h"
#include "consolidate.h"
#include <goffice/graph/gog-style.h>
......
......@@ -13,8 +13,6 @@
* Handles printing of Sheets.
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include "print-cell.h"
#include "gnumeric.h"
......@@ -26,7 +24,7 @@
#include "selection.h"
#include "workbook.h"
#include "workbook-control.h"
#include "workbook-edit.h"
#include "wbc-gtk.h"
#include "command-context.h"
#include "dialogs.h"
#include "gnumeric-gconf.h"
......@@ -43,9 +41,14 @@
#include "gnumeric-gconf.h"
#include <goffice/utils/go-font.h>
#include <goffice/utils/go-glib-extras.h>
#include <unistd.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <glib/gfileutils.h>
#include <unistd.h>
#include <errno.h>
/* The following structure is used by the printing system */
......@@ -1370,7 +1373,7 @@ gnm_custom_widget_apply_cb (GtkPrintOperation *operation,
}
void
gnm_print_sheet (WBCGtk *wbcg, Sheet *sheet,
gnm_print_sheet (WorkbookControl *wbc, Sheet *sheet,
gboolean preview, PrintRange default_range,
GsfOutput *export_dst)
{
......@@ -1388,7 +1391,7 @@ gnm_print_sheet (WBCGtk *wbcg, Sheet *sheet,
pi = printing_instance_new ();
pi->wb = sheet->workbook;
pi->wbc = wbcg ? WORKBOOK_CONTROL (wbcg) : NULL;
pi->wbc = wbc ? WORKBOOK_CONTROL (wbc) : NULL;
pi->sheet = sheet;
gnm_gconf_init_printer_defaults ();
......@@ -1430,7 +1433,8 @@ gnm_print_sheet (WBCGtk *wbcg, Sheet *sheet,
parent = NULL;
gtk_print_operation_set_show_progress (print, FALSE);
} else {
parent = wbcg_toplevel (wbcg);
if (NULL != wbc && IS_WBC_GTK(wbc))
parent = wbcg_toplevel (WBC_GTK (wbc));
action = preview
? GTK_PRINT_OPERATION_ACTION_PREVIEW
: GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG;
......
......@@ -2,12 +2,11 @@
#define GNUMERIC_PRINT_H
#include "gnumeric.h"
#include "workbook-control-gui.h"
#include <gsf/gsf-output.h>
#define GNUMERIC_PRINT_SETTING_PRINTRANGE_KEY "GnumericPrintRange"
#define GNUMERIC_PRINT_SETTING_PRINT_FROM_SHEET_KEY "GnumericPrintFromSheet"
#define GNUMERIC_PRINT_SETTING_PRINT_TO_SHEET_KEY "GnumericPrintToSheet"
#define GNUMERIC_PRINT_SETTING_PRINTRANGE_KEY "GnumericPrintRange"
#define GNUMERIC_PRINT_SETTING_PRINT_FROM_SHEET_KEY "GnumericPrintFromSheet"
#define GNUMERIC_PRINT_SETTING_PRINT_TO_SHEET_KEY "GnumericPrintToSheet"
typedef enum {
PRINT_ACTIVE_SHEET,
......@@ -18,7 +17,7 @@ typedef enum {
PRINT_SHEET_SELECTION_IGNORE_PRINTAREA
} PrintRange;
void gnm_print_sheet (WBCGtk *wbcg, Sheet *sheet,
void gnm_print_sheet (WorkbookControl *wbc, Sheet *sheet,
gboolean preview, PrintRange default_range,
GsfOutput *export_dst);
......
......@@ -20,8 +20,8 @@
#define __GNUMERIC_CELL_RENDERER_EXPR_ENTRY_H__
#include "gnumeric-cell-renderer-text.h"
#include "workbook-control-gui.h"
#include "gnumeric-expr-entry.h"
#include <gui-gnumeric.h>
G_BEGIN_DECLS
......
......@@ -2,7 +2,6 @@
#define GNUMERIC_WORKBOOK_CMD_FORMAT_H
#include "gnumeric.h"
#include "workbook-control-gui.h"
void workbook_cmd_resize_selected_colrow (WorkbookControl *wbc, Sheet *sheet,
gboolean is_cols, int new_size_pixels);
......
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