Commit 4c3734c9 authored by Morten Welinder's avatar Morten Welinder

Compilation: fix widget includes

parent 8c09233c
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <gsf/gsf-input-memory.h> #include <gsf/gsf-input-memory.h>
#include <gsf/gsf-output-memory.h> #include <gsf/gsf-output-memory.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <cairo.h> #include <cairo.h>
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <gnumeric-config.h> #include <gnumeric-config.h>
#include <gnumeric.h> #include <gnumeric.h>
#include <libguile.h> #include <libguile.h>
#include <gtk/gtk.h>
#include <guile/gh.h> #include <guile/gh.h>
#include <position.h> #include <position.h>
#include "guile-support.h" #include "guile-support.h"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <gnumeric.h> #include <gnumeric.h>
#include <libguile.h> #include <libguile.h>
#include <glib.h> #include <glib.h>
#include <gtk/gtk.h>
#include <stdlib.h> #include <stdlib.h>
#include "smob-value.h" #include "smob-value.h"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <goffice/app/module-plugin-defs.h> #include <goffice/app/module-plugin-defs.h>
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
#include <glib-object.h> #include <glib-object.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <string.h> #include <string.h>
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define PY_COMMAND_LINE #define PY_COMMAND_LINE
#include <glib.h> #include <glib.h>
#include <gtk/gtk.h>
#include <gnumeric.h> #include <gnumeric.h>
#include "gnm-py-interpreter.h" #include "gnm-py-interpreter.h"
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h> #include <goffice/app/module-plugin-defs.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <gnumeric-config.h> #include <gnumeric-config.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
#include <gnumeric.h> #include <gnumeric.h>
#include <gui-util.h> #include <gui-util.h>
...@@ -19,7 +18,6 @@ ...@@ -19,7 +18,6 @@
#include "py-interpreter-selector.h" #include "py-interpreter-selector.h"
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#include <glib.h> #include <glib.h>
struct _GnmPyInterpreterSelector { struct _GnmPyInterpreterSelector {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define PY_INTERPRETER_SELECTOR #define PY_INTERPRETER_SELECTOR
#include <glib.h> #include <glib.h>
#include <gtk/gtk.h>
#include <gnumeric.h> #include <gnumeric.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include "gnm-py-interpreter.h" #include "gnm-py-interpreter.h"
......
...@@ -33,7 +33,6 @@ bin_PROGRAMS += ssconvert ssindex ssgrep ssdiff ...@@ -33,7 +33,6 @@ bin_PROGRAMS += ssconvert ssindex ssgrep ssdiff
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(srcdir) \ -I$(srcdir) \
-I$(srcdir)/widgets \
$(GNUMERIC_CFLAGS) $(GNUMERIC_CFLAGS)
# A hint is needed to build these headers first: # A hint is needed to build these headers first:
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
#include "gnm-i18n.h" #include "gnm-i18n.h"
#include <gtk/gtk.h>
#define GNM_APP(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_APP_TYPE, GnmApp)) #define GNM_APP(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_APP_TYPE, GnmApp))
#define GNM_IS_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_APP_TYPE)) #define GNM_IS_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_APP_TYPE))
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "complete.h" #include "complete.h"
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
#include <stdlib.h> #include <stdlib.h>
#define PARENT_TYPE (G_TYPE_OBJECT) #define PARENT_TYPE (G_TYPE_OBJECT)
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include "selection.h" #include "selection.h"
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <gtk/gtk.h>
/** /**
* dialog__tool_preset_to_range: * dialog__tool_preset_to_range:
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <gnm-format.h> #include <gnm-format.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <gtk/gtk.h>
#define ABOUT_KEY "about-dialog" #define ABOUT_KEY "about-dialog"
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <value.h> #include <value.h>
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <gtk/gtk.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include "tools/filter.h" #include "tools/filter.h"
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#define CHI_SQUARED_I_KEY "analysistools-chi-square-independence-dialog" #define CHI_SQUARED_I_KEY "analysistools-chi-square-independence-dialog"
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#define FREQUENCY_KEY "analysistools-frequency-dialog" #define FREQUENCY_KEY "analysistools-frequency-dialog"
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#define KAPLAN_MEIER_KEY "analysistools-kaplan-meier-dialog" #define KAPLAN_MEIER_KEY "analysistools-kaplan-meier-dialog"
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#define NORMALITY_KEY "analysistools-normality-dialog" #define NORMALITY_KEY "analysistools-normality-dialog"
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#define ONE_MEAN_TEST_KEY "analysistools-one-mean-test-dialog" #define ONE_MEAN_TEST_KEY "analysistools-one-mean-test-dialog"
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#define PRINCIPAL_COMPONENTS_KEY "analysistools-principal-components-dialog" #define PRINCIPAL_COMPONENTS_KEY "analysistools-principal-components-dialog"
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#define SIGN_TEST_KEY_ONE "analysistools-sign-test-one-dialog" #define SIGN_TEST_KEY_ONE "analysistools-sign-test-one-dialog"
#define SIGN_TEST_KEY_TWO "analysistools-sign-test-two-dialog" #define SIGN_TEST_KEY_TWO "analysistools-sign-test-two-dialog"
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
#define WILCOXON_MANN_WHITNEY_KEY "analysistools-principal-components-dialog" #define WILCOXON_MANN_WHITNEY_KEY "analysistools-principal-components-dialog"
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <string.h> #include <string.h>
#include <gtk/gtk.h>
/**********************************************/ /**********************************************/
/* Generic guru items */ /* Generic guru items */
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <number-match.h> #include <number-match.h>
#include <undo.h> #include <undo.h>
#include <gtk/gtk.h>
#include <string.h> #include <string.h>
typedef struct { typedef struct {
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <ranges.h> #include <ranges.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
#include <string.h> #include <string.h>
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
typedef struct { typedef struct {
GtkWidget *dialog; GtkWidget *dialog;
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <mathfunc.h> #include <mathfunc.h>
#include <style-conditions.h> #include <style-conditions.h>
#include <gtk/gtk.h>
#include <string.h> #include <string.h>
......
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
#include <goffice/canvas/goc-canvas.h> #include <goffice/canvas/goc-canvas.h>
#include <goffice/canvas/goc-item.h> #include <goffice/canvas/goc-item.h>
#include <goffice/canvas/goc-rectangle.h> #include <goffice/canvas/goc-rectangle.h>
#include <gtk/gtk.h>
#include <string.h> #include <string.h>
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <value.h> #include <value.h>
#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <workbook.h> #include <workbook.h>
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <gtk/gtk.h>
#define COL_ROW_DIALOG_KEY "col-row-dialog" #define COL_ROW_DIALOG_KEY "col-row-dialog"
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <application.h> #include <application.h>
#include <workbook-cmd-format.h> #include <workbook-cmd-format.h>
#include <gtk/gtk.h>
#define COL_WIDTH_DIALOG_KEY "col-width-dialog" #define COL_WIDTH_DIALOG_KEY "col-width-dialog"
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <dialogs/dao-gui-utils.h> #include <dialogs/dao-gui-utils.h>
#include <tools/dao.h> #include <tools/dao.h>
#include <gtk/gtk.h>
#include <string.h> #include <string.h>
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <commands.h> #include <commands.h>
#include <ranges.h> #include <ranges.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#define DIALOG_DATA_TABLE_KEY "dialog-data-table" #define DIALOG_DATA_TABLE_KEY "dialog-data-table"
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include <widgets/gnumeric-cell-renderer-expr-entry.h> #include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-toggle.h> #include <widgets/gnumeric-cell-renderer-toggle.h>
#include <gtk/gtk.h>
#include <string.h> #include <string.h>
#define DEFINE_NAMES_KEY "define-names-dialog" #define DEFINE_NAMES_KEY "define-names-dialog"
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <command-context.h> #include <command-context.h>
#include <gtk/gtk.h>
#define DELETE_CELL_DIALOG_KEY "delete-cells-dialog" #define DELETE_CELL_DIALOG_KEY "delete-cells-dialog"
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <glib-object.h> #include <glib-object.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dialogs/dao-gui-utils.h> #include <dialogs/dao-gui-utils.h>
#include <gtk/gtk.h>
#include "tools/fill-series.h" #include "tools/fill-series.h"
#define FILL_SERIES_KEY "fill-series-dialog" #define FILL_SERIES_KEY "fill-series-dialog"
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h> #include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <gtk/gtk.h>
#include <locale.h> #include <locale.h>
#include <string.h> #include <string.h>
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <auto-format.h> #include <auto-format.h>
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
#include <string.h> #include <string.h>
#define F2(func,s) dgettext ((func)->tdomain->str, (s)) #define F2(func,s) dgettext ((func)->tdomain->str, (s))
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <selection.h> #include <selection.h>
#include <application.h> #include <application.h>
#include <gtk/gtk.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <gtk/gtk.h>
#define GOTO_KEY "goto-dialog" #define GOTO_KEY "goto-dialog"
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <string.h> #include <string.h>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <command-context.h> #include <command-context.h>
#include <gtk/gtk.h>
#define INSERT_CELL_DIALOG_KEY "insert-cells-dialog" #define INSERT_CELL_DIALOG_KEY "insert-cells-dialog"
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <selection.h> #include <selection.h>
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <gtk/gtk.h>
#define MERGE_KEY "merge-dialog" #define MERGE_KEY "merge-dialog"
......
#include <gnumeric-config.h> #include <gnumeric-config.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include "dialogs.h" #include "dialogs.h"
#include "gui-util.h" #include "gui-util.h"
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <selection.h> #include <selection.h>
#include <cmd-edit.h> #include <cmd-edit.h>
#include <gtk/gtk.h>
static char const * const paste_type_group[] = { static char const * const paste_type_group[] = {
"paste-type-all", "paste-type-all",
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h> #include <gsf/gsf-impl-utils.h>
#include <string.h> #include <string.h>
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include "gnumeric-conf.h" #include "gnumeric-conf.h"
#include <gui-util.h> #include <gui-util.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <string.h> #include <string.h>
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <gnumeric-config.h> #include <gnumeric-config.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <gnumeric.h> #include <gnumeric.h>
#include <gtk/gtk.h>
#include "dialogs.h" #include "dialogs.h"
#include "help.h" #include "help.h"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <application.h> #include <application.h>
#include <goffice/goffice.h> #include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <gtk/gtk.h>
#include <string.h> #include <string.h>
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <widgets/gnumeric-expr-entry.h> #include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h> #include <widgets/gnm-dao.h>
#include <gtk/gtk.h>
#include <string.h> #include <string.h>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <wbc-gtk.h> #include <wbc-gtk.h>
#include <gui-file.h> #include <gui-file.h>