GNOME.org
 

goffice r2295 - in trunk: . goffice/app goffice/component goffice/cut-n-paste/foocanvas goffice/drawing goffice/graph goffice/gtk goffice/math goffice/ms-compat goffice/utils plugins/plot_barcol plugins/plot_distrib plugins/plot_pie plugins/plot_radar plugins/plot_surface plugins/plot_xy plugins/reg_linear

Author: mortenw
Date: Sun Dec 14 21:58:11 2008
New Revision: 2295
URL: http://svn.gnome.org/viewvc/goffice?rev=2295&view=rev

Log:
2008-12-14  Morten Welinder  <terra gnome org>

	* */*.c: Clean up glib includes.  Patch from Pedro Fragoso.  Fixes
	#564021.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/goffice/app/goffice-app.h
   trunk/goffice/app/io-context.c
   trunk/goffice/component/go-component.h
   trunk/goffice/cut-n-paste/foocanvas/foo-canvas.h
   trunk/goffice/drawing/god-drawing-renderer-cairo.c
   trunk/goffice/drawing/god-drawing-renderer-gdk.h
   trunk/goffice/drawing/god-drawing-view.h
   trunk/goffice/graph/gog-axis-line.c
   trunk/goffice/graph/gog-axis.c
   trunk/goffice/graph/gog-chart.c
   trunk/goffice/graph/gog-child-button.c
   trunk/goffice/graph/gog-child-button.h
   trunk/goffice/graph/gog-error-bar.c
   trunk/goffice/graph/gog-graph.c
   trunk/goffice/graph/gog-grid.c
   trunk/goffice/graph/gog-guru.c
   trunk/goffice/graph/gog-guru.h
   trunk/goffice/graph/gog-label.c
   trunk/goffice/graph/gog-object.c
   trunk/goffice/graph/gog-plot.c
   trunk/goffice/graph/gog-reg-curve.c
   trunk/goffice/graph/gog-renderer.h
   trunk/goffice/graph/gog-series.c
   trunk/goffice/graph/gog-series.h
   trunk/goffice/graph/gog-style.c
   trunk/goffice/gtk/go-3d-rotation-sel.c
   trunk/goffice/gtk/go-3d-rotation-sel.h
   trunk/goffice/gtk/go-action-combo-color.c
   trunk/goffice/gtk/go-action-combo-pixmaps.c
   trunk/goffice/gtk/go-action-combo-stack.c
   trunk/goffice/gtk/go-action-combo-text.c
   trunk/goffice/gtk/go-charmap-sel.c
   trunk/goffice/gtk/go-charmap-sel.h
   trunk/goffice/gtk/go-color-palette.c
   trunk/goffice/gtk/go-color-palette.h
   trunk/goffice/gtk/go-color-selector.c
   trunk/goffice/gtk/go-color-selector.h
   trunk/goffice/gtk/go-combo-box.c
   trunk/goffice/gtk/go-combo-box.h
   trunk/goffice/gtk/go-combo-color.c
   trunk/goffice/gtk/go-combo-color.h
   trunk/goffice/gtk/go-combo-pixmaps.c
   trunk/goffice/gtk/go-combo-pixmaps.h
   trunk/goffice/gtk/go-combo-text.c
   trunk/goffice/gtk/go-combo-text.h
   trunk/goffice/gtk/go-font-sel.c
   trunk/goffice/gtk/go-font-sel.h
   trunk/goffice/gtk/go-format-sel.c
   trunk/goffice/gtk/go-format-sel.h
   trunk/goffice/gtk/go-gradient-selector.h
   trunk/goffice/gtk/go-graph-widget.c
   trunk/goffice/gtk/go-graph-widget.h
   trunk/goffice/gtk/go-image-sel.c
   trunk/goffice/gtk/go-image-sel.h
   trunk/goffice/gtk/go-line-selector.h
   trunk/goffice/gtk/go-locale-sel.c
   trunk/goffice/gtk/go-locale-sel.h
   trunk/goffice/gtk/go-marker-selector.h
   trunk/goffice/gtk/go-palette.c
   trunk/goffice/gtk/go-palette.h
   trunk/goffice/gtk/go-pattern-selector.h
   trunk/goffice/gtk/go-pixbuf.h
   trunk/goffice/gtk/go-rotation-sel.c
   trunk/goffice/gtk/go-rotation-sel.h
   trunk/goffice/gtk/go-selector.c
   trunk/goffice/gtk/go-selector.h
   trunk/goffice/gtk/goffice-gtk.h
   trunk/goffice/math/go-cspline.c
   trunk/goffice/math/go-math.h
   trunk/goffice/math/go-matrix3x3.h
   trunk/goffice/math/go-rangefunc.c
   trunk/goffice/math/go-rangefunc.h
   trunk/goffice/math/go-regression.c
   trunk/goffice/math/go-regression.h
   trunk/goffice/ms-compat/go-ms-parser.c
   trunk/goffice/ms-compat/god-drawing-ms.c
   trunk/goffice/utils/go-color.c
   trunk/goffice/utils/go-color.h
   trunk/plugins/plot_barcol/gog-1.5d.c
   trunk/plugins/plot_barcol/gog-barcol-prefs.c
   trunk/plugins/plot_barcol/gog-minmax.c
   trunk/plugins/plot_distrib/gog-boxplot.c
   trunk/plugins/plot_pie/gog-pie-prefs.c
   trunk/plugins/plot_radar/gog-radar.c
   trunk/plugins/plot_surface/gog-xyz-prefs.c
   trunk/plugins/plot_surface/gog-xyz-surface-prefs.c
   trunk/plugins/plot_xy/gog-bubble-prefs.c
   trunk/plugins/reg_linear/gog-polynom-reg.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Dec 14 21:58:11 2008
@@ -27,6 +27,9 @@
 	* Fix memory corruption issue.  [#561708]
 	* Fix problem with formats like "0.0E-00".  [#563601]
 
+Pedro Fragoso:
+	* Clean up glib includes.   [#564021]
+
 --------------------------------------------------------------------------
 goffice 0.7.2:
 

Modified: trunk/goffice/app/goffice-app.h
==============================================================================
--- trunk/goffice/app/goffice-app.h	(original)
+++ trunk/goffice/app/goffice-app.h	Sun Dec 14 21:58:11 2008
@@ -22,7 +22,7 @@
 #ifndef GOFFICE_APP_H
 #define GOFFICE_APP_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/app/io-context.c
==============================================================================
--- trunk/goffice/app/io-context.c	(original)
+++ trunk/goffice/app/io-context.c	Sun Dec 14 21:58:11 2008
@@ -17,7 +17,7 @@
 #include <goffice/utils/go-file.h>
 #include <gsf/gsf-impl-utils.h>
 #ifdef GOFFICE_WITH_GTK
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #endif
 #include <glib/gi18n-lib.h>
 

Modified: trunk/goffice/component/go-component.h
==============================================================================
--- trunk/goffice/component/go-component.h	(original)
+++ trunk/goffice/component/go-component.h	Sun Dec 14 21:58:11 2008
@@ -23,7 +23,7 @@
 #define GO_COMPONENT_H
 
 #include <glib-object.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <goffice/goffice.h>
 #include <goffice/app/goffice-app.h>
 #include <goffice/component/goffice-component.h>

Modified: trunk/goffice/cut-n-paste/foocanvas/foo-canvas.h
==============================================================================
--- trunk/goffice/cut-n-paste/foocanvas/foo-canvas.h	(original)
+++ trunk/goffice/cut-n-paste/foocanvas/foo-canvas.h	Sun Dec 14 21:58:11 2008
@@ -39,8 +39,8 @@
 #ifndef FOO_CANVAS_H
 #define FOO_CANVAS_H
 
-#include <gtk/gtklayout.h>
-#include <gdk/gdkevents.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
 #include <stdarg.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/drawing/god-drawing-renderer-cairo.c
==============================================================================
--- trunk/goffice/drawing/god-drawing-renderer-cairo.c	(original)
+++ trunk/goffice/drawing/god-drawing-renderer-cairo.c	Sun Dec 14 21:58:11 2008
@@ -30,7 +30,7 @@
 
 #include <cairo.h>
 #include <pango/pangocairo.h>
-#include <gdk/gdkcairo.h>
+#include <gdk/gdk.h>
 
 static GdkPixbuf *
 get_pixbuf (GodDrawing *drawing,

Modified: trunk/goffice/drawing/god-drawing-renderer-gdk.h
==============================================================================
--- trunk/goffice/drawing/god-drawing-renderer-gdk.h	(original)
+++ trunk/goffice/drawing/god-drawing-renderer-gdk.h	Sun Dec 14 21:58:11 2008
@@ -17,7 +17,7 @@
 #include <glib.h>
 #include <goffice/drawing/god-drawing.h>
 #include <goffice/drawing/god-anchor.h>
-#include <gdk/gdkdrawable.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/drawing/god-drawing-view.h
==============================================================================
--- trunk/goffice/drawing/god-drawing-view.h	(original)
+++ trunk/goffice/drawing/god-drawing-view.h	Sun Dec 14 21:58:11 2008
@@ -17,8 +17,8 @@
 #include <glib.h>
 #include <goffice/drawing/god-drawing.h>
 #include <goffice/drawing/god-anchor.h>
-#include <gdk/gdkdrawable.h>
-#include <gtk/gtkdrawingarea.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/graph/gog-axis-line.c
==============================================================================
--- trunk/goffice/graph/gog-axis-line.c	(original)
+++ trunk/goffice/graph/gog-axis-line.c	Sun Dec 14 21:58:11 2008
@@ -37,13 +37,6 @@
 
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
-#include <goffice/gtk/goffice-gtk.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
 #endif
 
 #include <glib/gi18n-lib.h>

Modified: trunk/goffice/graph/gog-axis.c
==============================================================================
--- trunk/goffice/graph/gog-axis.c	(original)
+++ trunk/goffice/graph/gog-axis.c	Sun Dec 14 21:58:11 2008
@@ -45,17 +45,6 @@
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/gtk/go-format-sel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
 #endif
 
 #include <string.h>

Modified: trunk/goffice/graph/gog-chart.c
==============================================================================
--- trunk/goffice/graph/gog-chart.c	(original)
+++ trunk/goffice/graph/gog-chart.c	Sun Dec 14 21:58:11 2008
@@ -48,9 +48,6 @@
 
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
 #endif
 
 static const struct {

Modified: trunk/goffice/graph/gog-child-button.c
==============================================================================
--- trunk/goffice/graph/gog-child-button.c	(original)
+++ trunk/goffice/graph/gog-child-button.c	Sun Dec 14 21:58:11 2008
@@ -31,15 +31,12 @@
 #include <goffice/gtk/go-pixbuf.h>
 #include <goffice/goffice-config.h>
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 #include <gdk/gdkpixbuf.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <glib/gi18n-lib.h>
-#include <glib/ghash.h>
 
 #include <string.h>
 

Modified: trunk/goffice/graph/gog-child-button.h
==============================================================================
--- trunk/goffice/graph/gog-child-button.h	(original)
+++ trunk/goffice/graph/gog-child-button.h	Sun Dec 14 21:58:11 2008
@@ -23,7 +23,7 @@
 #ifndef GOG_CHILD_BUTTON_H
 #define GOG_CHILD_BUTTON_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <goffice/graph/gog-object.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/graph/gog-error-bar.c
==============================================================================
--- trunk/goffice/graph/gog-error-bar.c	(original)
+++ trunk/goffice/graph/gog-error-bar.c	Sun Dec 14 21:58:11 2008
@@ -46,13 +46,6 @@
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/gtk/go-pixbuf.h>
 #include <goffice/gtk/go-color-selector.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
 #include <glade/glade-xml.h>
 
 typedef struct {

Modified: trunk/goffice/graph/gog-graph.c
==============================================================================
--- trunk/goffice/graph/gog-graph.c	(original)
+++ trunk/goffice/graph/gog-graph.c	Sun Dec 14 21:58:11 2008
@@ -37,9 +37,7 @@
 #include <stdlib.h>
 
 #ifdef GOFFICE_WITH_GTK
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #endif
 
 #define GOG_GRAPH_DEFAULT_WIDTH 	GO_CM_TO_PT (12.0)
@@ -912,7 +910,7 @@
 }
 
 #ifdef GOFFICE_WITH_GTK
-#include <gdk/gdkcursor.h>
+#include <gdk/gdk.h>
 
 /**
  * gog_graph_view_handle_event:

Modified: trunk/goffice/graph/gog-grid.c
==============================================================================
--- trunk/goffice/graph/gog-grid.c	(original)
+++ trunk/goffice/graph/gog-grid.c	Sun Dec 14 21:58:11 2008
@@ -38,7 +38,7 @@
 #include <gsf/gsf-impl-utils.h>
 
 #ifdef GOFFICE_WITH_GTK
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 #endif
 
 struct _GogGrid {

Modified: trunk/goffice/graph/gog-guru.c
==============================================================================
--- trunk/goffice/graph/gog-guru.c	(original)
+++ trunk/goffice/graph/gog-guru.c	Sun Dec 14 21:58:11 2008
@@ -46,23 +46,7 @@
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h>
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkviewport.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 typedef struct _GraphGuruState		GraphGuruState;

Modified: trunk/goffice/graph/gog-guru.h
==============================================================================
--- trunk/goffice/graph/gog-guru.h	(original)
+++ trunk/goffice/graph/gog-guru.h	Sun Dec 14 21:58:11 2008
@@ -23,7 +23,7 @@
 
 #include <goffice/graph/goffice-graph.h>
 #include <goffice/app/goffice-app.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/graph/gog-label.c
==============================================================================
--- trunk/goffice/graph/gog-label.c	(original)
+++ trunk/goffice/graph/gog-label.c	Sun Dec 14 21:58:11 2008
@@ -40,12 +40,6 @@
 
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
 #endif
 
 static GType gog_text_view_get_type (void);

Modified: trunk/goffice/graph/gog-object.c
==============================================================================
--- trunk/goffice/graph/gog-object.c	(original)
+++ trunk/goffice/graph/gog-object.c	Sun Dec 14 21:58:11 2008
@@ -33,13 +33,6 @@
 
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkwidget.h>
 #endif
 
 /*****************************************************************************/

Modified: trunk/goffice/graph/gog-plot.c
==============================================================================
--- trunk/goffice/graph/gog-plot.c	(original)
+++ trunk/goffice/graph/gog-plot.c	Sun Dec 14 21:58:11 2008
@@ -36,14 +36,7 @@
 #include <glib/gi18n-lib.h>
 
 #ifdef GOFFICE_WITH_GTK
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 #endif
 
 #include <gsf/gsf-impl-utils.h>

Modified: trunk/goffice/graph/gog-reg-curve.c
==============================================================================
--- trunk/goffice/graph/gog-reg-curve.c	(original)
+++ trunk/goffice/graph/gog-reg-curve.c	Sun Dec 14 21:58:11 2008
@@ -40,8 +40,6 @@
 
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktable.h>
 #endif
 
 #define GOG_REG_CURVE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GOG_REG_CURVE_TYPE, GogRegCurveClass))

Modified: trunk/goffice/graph/gog-renderer.h
==============================================================================
--- trunk/goffice/graph/gog-renderer.h	(original)
+++ trunk/goffice/graph/gog-renderer.h	Sun Dec 14 21:58:11 2008
@@ -31,7 +31,6 @@
 #include <gsf/gsf.h>
 
 #ifdef GOFFICE_WITH_GTK
-#include <gtk/gtkenums.h>
 #include <goffice/gtk/goffice-gtk.h>
 #include <gdk/gdk.h>
 #else

Modified: trunk/goffice/graph/gog-series.c
==============================================================================
--- trunk/goffice/graph/gog-series.c	(original)
+++ trunk/goffice/graph/gog-series.c	Sun Dec 14 21:58:11 2008
@@ -34,15 +34,6 @@
 
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcombobox.h>
 #endif
 
 #include <string.h>
@@ -1203,4 +1194,4 @@
 	return (series_klass->get_interpolation_params)?
 			series_klass->get_interpolation_params (series):
 			NULL;
-}
\ No newline at end of file
+}

Modified: trunk/goffice/graph/gog-series.h
==============================================================================
--- trunk/goffice/graph/gog-series.h	(original)
+++ trunk/goffice/graph/gog-series.h	Sun Dec 14 21:58:11 2008
@@ -81,7 +81,7 @@
 GogDataset   *gog_series_get_interpolation_params (GogSeries const *series);
 
 #ifdef GOFFICE_WITH_GTK
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 
 void 		  gog_series_populate_fill_type_combo 	(GogSeries const *series, GtkComboBox *combo);
 GogSeriesFillType gog_series_get_fill_type_from_combo 	(GogSeries const *series, GtkComboBox *combo);

Modified: trunk/goffice/graph/gog-style.c
==============================================================================
--- trunk/goffice/graph/gog-style.c	(original)
+++ trunk/goffice/graph/gog-style.c	Sun Dec 14 21:58:11 2008
@@ -47,16 +47,6 @@
 #include <goffice/gtk/go-image-sel.h>
 
 #include <glade/glade-xml.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtksizegroup.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 #endif
 

Modified: trunk/goffice/gtk/go-3d-rotation-sel.c
==============================================================================
--- trunk/goffice/gtk/go-3d-rotation-sel.c	(original)
+++ trunk/goffice/gtk/go-3d-rotation-sel.c	Sun Dec 14 21:58:11 2008
@@ -29,10 +29,6 @@
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h>
 #include <gsf/gsf-impl-utils.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtklabel.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 

Modified: trunk/goffice/gtk/go-3d-rotation-sel.h
==============================================================================
--- trunk/goffice/gtk/go-3d-rotation-sel.h	(original)
+++ trunk/goffice/gtk/go-3d-rotation-sel.h	Sun Dec 14 21:58:11 2008
@@ -19,7 +19,7 @@
 #ifndef _GO_3D_ROTATION_SEL_H_
 #define _GO_3D_ROTATION_SEL_H_
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <goffice/utils/goffice-utils.h>
 #include <goffice/math/go-matrix3x3.h>
 

Modified: trunk/goffice/gtk/go-action-combo-color.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-color.c	(original)
+++ trunk/goffice/gtk/go-action-combo-color.c	Sun Dec 14 21:58:11 2008
@@ -25,13 +25,6 @@
 #include "go-color-palette.h"
 #include "goffice-gtk.h"
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktoolbar.h>
 #include <gsf/gsf-impl-utils.h>
 
 #include <glib/gi18n-lib.h>

Modified: trunk/goffice/gtk/go-action-combo-pixmaps.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-pixmaps.c	(original)
+++ trunk/goffice/gtk/go-action-combo-pixmaps.c	Sun Dec 14 21:58:11 2008
@@ -24,12 +24,6 @@
 #include "go-combo-box.h"
 #include "goffice-gtk.h"
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwidget.h>
 #include <gsf/gsf-impl-utils.h>
 #include <glib/gi18n-lib.h>
 

Modified: trunk/goffice/gtk/go-action-combo-stack.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-stack.c	(original)
+++ trunk/goffice/gtk/go-action-combo-stack.c	Sun Dec 14 21:58:11 2008
@@ -23,20 +23,6 @@
 #include "go-combo-box.h"
 #include "goffice-gtk.h"
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkscrolledwindow.h>
-
 #include <gsf/gsf-impl-utils.h>
 #include <glib/gi18n-lib.h>
 #include <stdio.h>

Modified: trunk/goffice/gtk/go-action-combo-text.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-text.c	(original)
+++ trunk/goffice/gtk/go-action-combo-text.c	Sun Dec 14 21:58:11 2008
@@ -25,7 +25,6 @@
 #include "goffice-gtk.h"
 #include <goffice/utils/go-glib-extras.h>
 
-#include <gtk/gtk.h>
 #include <gsf/gsf-impl-utils.h>
 #include <glib/gi18n-lib.h>
 

Modified: trunk/goffice/gtk/go-charmap-sel.c
==============================================================================
--- trunk/goffice/gtk/go-charmap-sel.c	(original)
+++ trunk/goffice/gtk/go-charmap-sel.c	Sun Dec 14 21:58:11 2008
@@ -27,12 +27,6 @@
 #include "go-charmap-sel.h"
 #include "go-optionmenu.h"
 #include <goffice/utils/go-glib-extras.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
 #include <glib/gi18n-lib.h>
 #include <gsf/gsf-impl-utils.h>
 #include <string.h>

Modified: trunk/goffice/gtk/go-charmap-sel.h
==============================================================================
--- trunk/goffice/gtk/go-charmap-sel.h	(original)
+++ trunk/goffice/gtk/go-charmap-sel.h	Sun Dec 14 21:58:11 2008
@@ -25,7 +25,7 @@
 #define _GO_CHARMAP_SEL_H_
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-color-palette.c
==============================================================================
--- trunk/goffice/gtk/go-color-palette.c	(original)
+++ trunk/goffice/gtk/go-color-palette.c	Sun Dec 14 21:58:11 2008
@@ -33,9 +33,8 @@
 #include <goffice/utils/go-marshalers.h>
 
 #include <goffice/utils/go-color.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 #include <glib/gi18n-lib.h>
 #include <gsf/gsf-impl-utils.h>
 

Modified: trunk/goffice/gtk/go-color-palette.h
==============================================================================
--- trunk/goffice/gtk/go-color-palette.h	(original)
+++ trunk/goffice/gtk/go-color-palette.h	Sun Dec 14 21:58:11 2008
@@ -31,7 +31,7 @@
 #define _GO_COLOR_PALETTE_H_
 
 #include <goffice/gtk/go-color-group.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-color-selector.c
==============================================================================
--- trunk/goffice/gtk/go-color-selector.c	(original)
+++ trunk/goffice/gtk/go-color-selector.c	Sun Dec 14 21:58:11 2008
@@ -27,8 +27,7 @@
 #include <goffice/gtk/go-color-group.h>
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkcolorseldialog.h>
+#include <gtk/gtk.h>
 
 extern GONamedColor default_color_set [];
 

Modified: trunk/goffice/gtk/go-color-selector.h
==============================================================================
--- trunk/goffice/gtk/go-color-selector.h	(original)
+++ trunk/goffice/gtk/go-color-selector.h	Sun Dec 14 21:58:11 2008
@@ -24,7 +24,6 @@
 
 #include <goffice/utils/go-color.h>
 #include <goffice/gtk/go-selector.h>
-#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-combo-box.c
==============================================================================
--- trunk/goffice/gtk/go-combo-box.c	(original)
+++ trunk/goffice/gtk/go-combo-box.c	Sun Dec 14 21:58:11 2008
@@ -29,7 +29,6 @@
 #include <goffice/utils/go-marshalers.h>
 #include <goffice/gtk/goffice-gtk.h>
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n-lib.h>
 

Modified: trunk/goffice/gtk/go-combo-box.h
==============================================================================
--- trunk/goffice/gtk/go-combo-box.h	(original)
+++ trunk/goffice/gtk/go-combo-box.h	Sun Dec 14 21:58:11 2008
@@ -24,7 +24,7 @@
 #ifndef _GO_COMBO_BOX_H_
 #define _GO_COMBO_BOX_H_
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-combo-color.c
==============================================================================
--- trunk/goffice/gtk/go-combo-color.c	(original)
+++ trunk/goffice/gtk/go-combo-color.c	Sun Dec 14 21:58:11 2008
@@ -38,10 +38,7 @@
 #include "go-color-palette.h"
 
 #include <gsf/gsf-impl-utils.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwindow.h>
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 struct _GOComboColor {
 	GOComboBox     combo_box;

Modified: trunk/goffice/gtk/go-combo-color.h
==============================================================================
--- trunk/goffice/gtk/go-combo-color.h	(original)
+++ trunk/goffice/gtk/go-combo-color.h	Sun Dec 14 21:58:11 2008
@@ -33,7 +33,7 @@
 #include <glib-object.h>
 #include <goffice/gtk/go-color-group.h>
 #include <goffice/utils/go-color.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-combo-pixmaps.c
==============================================================================
--- trunk/goffice/gtk/go-combo-pixmaps.c	(original)
+++ trunk/goffice/gtk/go-combo-pixmaps.c	Sun Dec 14 21:58:11 2008
@@ -26,7 +26,6 @@
 #include "go-combo-box.h"
 #include <goffice/gtk/goffice-gtk.h>
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <glib/gi18n-lib.h>

Modified: trunk/goffice/gtk/go-combo-pixmaps.h
==============================================================================
--- trunk/goffice/gtk/go-combo-pixmaps.h	(original)
+++ trunk/goffice/gtk/go-combo-pixmaps.h	Sun Dec 14 21:58:11 2008
@@ -24,7 +24,7 @@
 #ifndef _GO_COMBO_PIXMAPS_H_
 #define _GO_COMBO_PIXMAPS_H_
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/gtk/go-combo-text.c
==============================================================================
--- trunk/goffice/gtk/go-combo-text.c	(original)
+++ trunk/goffice/gtk/go-combo-text.c	Sun Dec 14 21:58:11 2008
@@ -8,15 +8,6 @@
 #include "go-combo-box.h"
 #include <goffice/utils/go-marshalers.h>
 
-#include <gtk/gtksignal.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-
 #include <gsf/gsf-impl-utils.h>
 
 struct _GoComboText {

Modified: trunk/goffice/gtk/go-combo-text.h
==============================================================================
--- trunk/goffice/gtk/go-combo-text.h	(original)
+++ trunk/goffice/gtk/go-combo-text.h	Sun Dec 14 21:58:11 2008
@@ -2,7 +2,7 @@
 #ifndef _GO_COMBO_TEXT_H_
 #define _GO_COMBO_TEXT_H_
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-font-sel.c
==============================================================================
--- trunk/goffice/gtk/go-font-sel.c	(original)
+++ trunk/goffice/gtk/go-font-sel.c	Sun Dec 14 21:58:11 2008
@@ -14,14 +14,6 @@
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/utils/go-color.h>
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkentry.h>
-
 #include <goffice/cut-n-paste/foocanvas/foo-canvas.h>
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-text.h>
 

Modified: trunk/goffice/gtk/go-font-sel.h
==============================================================================
--- trunk/goffice/gtk/go-font-sel.h	(original)
+++ trunk/goffice/gtk/go-font-sel.h	Sun Dec 14 21:58:11 2008
@@ -19,7 +19,7 @@
 #ifndef _GO_FONT_SEL_H_
 #define _GO_FONT_SEL_H_
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <goffice/utils/goffice-utils.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/gtk/go-format-sel.c
==============================================================================
--- trunk/goffice/gtk/go-format-sel.c	(original)
+++ trunk/goffice/gtk/go-format-sel.c	Sun Dec 14 21:58:11 2008
@@ -30,7 +30,6 @@
 #include "goffice/utils/go-marshalers.h"
 #include "goffice/utils/go-glib-extras.h"
 
-#include <gtk/gtk.h>
 #include <gsf/gsf-impl-utils.h>
 #include <glib/gi18n-lib.h>
 

Modified: trunk/goffice/gtk/go-format-sel.h
==============================================================================
--- trunk/goffice/gtk/go-format-sel.h	(original)
+++ trunk/goffice/gtk/go-format-sel.h	Sun Dec 14 21:58:11 2008
@@ -19,7 +19,7 @@
 #ifndef _GO_FORMAT_SEL_H_
 #define _GO_FORMAT_SEL_H_
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <goffice/utils/goffice-utils.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/gtk/go-gradient-selector.h
==============================================================================
--- trunk/goffice/gtk/go-gradient-selector.h	(original)
+++ trunk/goffice/gtk/go-gradient-selector.h	Sun Dec 14 21:58:11 2008
@@ -24,7 +24,6 @@
 
 #include <goffice/utils/go-gradient.h>
 #include <goffice/gtk/go-selector.h>
-#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-graph-widget.c
==============================================================================
--- trunk/goffice/gtk/go-graph-widget.c	(original)
+++ trunk/goffice/gtk/go-graph-widget.c	Sun Dec 14 21:58:11 2008
@@ -20,7 +20,6 @@
 
 #include <goffice-config.h>
 #include "go-graph-widget.h"
-#include <gtk/gtklayout.h>
 #include <goffice/graph/gog-graph.h>
 #include <goffice/graph/gog-object.h>
 #include <goffice/graph/gog-renderer.h>

Modified: trunk/goffice/gtk/go-graph-widget.h
==============================================================================
--- trunk/goffice/gtk/go-graph-widget.h	(original)
+++ trunk/goffice/gtk/go-graph-widget.h	Sun Dec 14 21:58:11 2008
@@ -22,7 +22,7 @@
 #define _GO_GRAPH_WIDGET_H_
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <goffice/graph/gog-chart.h>
 #include <goffice/graph/gog-graph.h>
 

Modified: trunk/goffice/gtk/go-image-sel.c
==============================================================================
--- trunk/goffice/gtk/go-image-sel.c	(original)
+++ trunk/goffice/gtk/go-image-sel.c	Sun Dec 14 21:58:11 2008
@@ -25,10 +25,6 @@
 #include <goffice/app/go-doc.h>
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/utils/go-file.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkiconview.h>
-#include <gtk/gtktable.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 

Modified: trunk/goffice/gtk/go-image-sel.h
==============================================================================
--- trunk/goffice/gtk/go-image-sel.h	(original)
+++ trunk/goffice/gtk/go-image-sel.h	Sun Dec 14 21:58:11 2008
@@ -25,7 +25,7 @@
 
 #include <goffice/app/go-app.h>
 #include <goffice/utils/go-image.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-line-selector.h
==============================================================================
--- trunk/goffice/gtk/go-line-selector.h	(original)
+++ trunk/goffice/gtk/go-line-selector.h	Sun Dec 14 21:58:11 2008
@@ -24,7 +24,6 @@
 
 #include <goffice/utils/go-line.h>
 #include <goffice/gtk/go-selector.h>
-#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-locale-sel.c
==============================================================================
--- trunk/goffice/gtk/go-locale-sel.c	(original)
+++ trunk/goffice/gtk/go-locale-sel.c	Sun Dec 14 21:58:11 2008
@@ -28,7 +28,6 @@
 #include "go-optionmenu.h"
 #include "goffice/utils/go-glib-extras.h"
 #include "goffice/utils/go-locale.h"
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <gsf/gsf-impl-utils.h>
 #include <string.h>

Modified: trunk/goffice/gtk/go-locale-sel.h
==============================================================================
--- trunk/goffice/gtk/go-locale-sel.h	(original)
+++ trunk/goffice/gtk/go-locale-sel.h	Sun Dec 14 21:58:11 2008
@@ -23,7 +23,7 @@
 #ifndef _GO_LOCALE_SEL_H_
 #define _GO_LOCALE_SEL_H_
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-marker-selector.h
==============================================================================
--- trunk/goffice/gtk/go-marker-selector.h	(original)
+++ trunk/goffice/gtk/go-marker-selector.h	Sun Dec 14 21:58:11 2008
@@ -24,7 +24,6 @@
 
 #include <goffice/utils/go-marker.h>
 #include <goffice/gtk/go-selector.h>
-#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-palette.c
==============================================================================
--- trunk/goffice/gtk/go-palette.c	(original)
+++ trunk/goffice/gtk/go-palette.c	Sun Dec 14 21:58:11 2008
@@ -23,7 +23,6 @@
 #include <goffice/utils/go-image.h>
 #include <goffice/gtk/goffice-gtk.h>
 #include "go-palette.h"
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 

Modified: trunk/goffice/gtk/go-palette.h
==============================================================================
--- trunk/goffice/gtk/go-palette.h	(original)
+++ trunk/goffice/gtk/go-palette.h	Sun Dec 14 21:58:11 2008
@@ -22,7 +22,7 @@
 #ifndef GO_PALETTE_H
 #define GO_PALETTE_H
 
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 #include <cairo.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/gtk/go-pattern-selector.h
==============================================================================
--- trunk/goffice/gtk/go-pattern-selector.h	(original)
+++ trunk/goffice/gtk/go-pattern-selector.h	Sun Dec 14 21:58:11 2008
@@ -24,7 +24,6 @@
 
 #include <goffice/utils/go-pattern.h>
 #include <goffice/gtk/go-selector.h>
-#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-pixbuf.h
==============================================================================
--- trunk/goffice/gtk/go-pixbuf.h	(original)
+++ trunk/goffice/gtk/go-pixbuf.h	Sun Dec 14 21:58:11 2008
@@ -20,7 +20,7 @@
 #ifndef GO_PIXBUF_H
 #define GO_PIXBUF_H
 
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/gtk/go-rotation-sel.c
==============================================================================
--- trunk/goffice/gtk/go-rotation-sel.c	(original)
+++ trunk/goffice/gtk/go-rotation-sel.c	Sun Dec 14 21:58:11 2008
@@ -27,9 +27,6 @@
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-widget.h>
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
 #include <gsf/gsf-impl-utils.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtklabel.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 

Modified: trunk/goffice/gtk/go-rotation-sel.h
==============================================================================
--- trunk/goffice/gtk/go-rotation-sel.h	(original)
+++ trunk/goffice/gtk/go-rotation-sel.h	Sun Dec 14 21:58:11 2008
@@ -19,7 +19,7 @@
 #ifndef _GO_ROTATION_SEL_H_
 #define _GO_ROTATION_SEL_H_
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <goffice/utils/goffice-utils.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/gtk/go-selector.c
==============================================================================
--- trunk/goffice/gtk/go-selector.c	(original)
+++ trunk/goffice/gtk/go-selector.c	Sun Dec 14 21:58:11 2008
@@ -24,27 +24,6 @@
 
 #include "go-selector.h"
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellview.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkiconview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkversion.h>
-
 #include <glib/gi18n-lib.h>
 
 #include <gdk/gdkkeysyms.h>

Modified: trunk/goffice/gtk/go-selector.h
==============================================================================
--- trunk/goffice/gtk/go-selector.h	(original)
+++ trunk/goffice/gtk/go-selector.h	Sun Dec 14 21:58:11 2008
@@ -22,8 +22,6 @@
 #ifndef GO_SELECTOR_H
 #define GO_SELECTOR_H
 
-#include <gtk/gtkhbox.h>
-
 #include <goffice/gtk/go-palette.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/gtk/goffice-gtk.h
==============================================================================
--- trunk/goffice/gtk/goffice-gtk.h	(original)
+++ trunk/goffice/gtk/goffice-gtk.h	Sun Dec 14 21:58:11 2008
@@ -19,11 +19,8 @@
 #ifndef _GOFFICE_GTK_H_
 #define _GOFFICE_GTK_H_
 
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
-#include <gtk/gtkfilechooser.h>
 #include <goffice/app/goffice-app.h>
 #include <goffice/utils/go-image.h>
 

Modified: trunk/goffice/math/go-cspline.c
==============================================================================
--- trunk/goffice/math/go-cspline.c	(original)
+++ trunk/goffice/math/go-cspline.c	Sun Dec 14 21:58:11 2008
@@ -26,8 +26,6 @@
 #include <goffice/goffice-config.h>
 #include "go-rangefunc.h"
 #include "go-cspline.h"
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
 
 #ifndef DOUBLE
 

Modified: trunk/goffice/math/go-math.h
==============================================================================
--- trunk/goffice/math/go-math.h	(original)
+++ trunk/goffice/math/go-math.h	Sun Dec 14 21:58:11 2008
@@ -3,7 +3,7 @@
 
 #include <math.h>
 #include <goffice/goffice-features.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <goffice/goffice.h>
 
 G_BEGIN_DECLS

Modified: trunk/goffice/math/go-matrix3x3.h
==============================================================================
--- trunk/goffice/math/go-matrix3x3.h	(original)
+++ trunk/goffice/math/go-matrix3x3.h	Sun Dec 14 21:58:11 2008
@@ -23,7 +23,7 @@
 #ifndef GO_MATRIX3X3_H
 #define GO_MATRIX3X3_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 typedef struct {
 	gdouble a11, a12, a13, a21, a22, a23, a31, a32, a33;

Modified: trunk/goffice/math/go-rangefunc.c
==============================================================================
--- trunk/goffice/math/go-rangefunc.c	(original)
+++ trunk/goffice/math/go-rangefunc.c	Sun Dec 14 21:58:11 2008
@@ -8,7 +8,6 @@
 
 #include <goffice/goffice-config.h>
 #include "go-rangefunc.h"
-#include <glib/gmem.h>
 
 #include <math.h>
 #include <stdlib.h>

Modified: trunk/goffice/math/go-rangefunc.h
==============================================================================
--- trunk/goffice/math/go-rangefunc.h	(original)
+++ trunk/goffice/math/go-rangefunc.h	Sun Dec 14 21:58:11 2008
@@ -1,6 +1,6 @@
 #ifndef GO_RANGEFUNC_H
 #define GO_RANGEFUNC_H
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/math/go-regression.c
==============================================================================
--- trunk/goffice/math/go-regression.c	(original)
+++ trunk/goffice/math/go-regression.c	Sun Dec 14 21:58:11 2008
@@ -12,9 +12,6 @@
 #include "go-rangefunc.h"
 #include "go-math.h"
 
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>

Modified: trunk/goffice/math/go-regression.h
==============================================================================
--- trunk/goffice/math/go-regression.h	(original)
+++ trunk/goffice/math/go-regression.h	Sun Dec 14 21:58:11 2008
@@ -1,7 +1,7 @@
 #ifndef GO_UTILS_REGRESSION_H
 #define GO_UTILS_REGRESSION_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/goffice/ms-compat/go-ms-parser.c
==============================================================================
--- trunk/goffice/ms-compat/go-ms-parser.c	(original)
+++ trunk/goffice/ms-compat/go-ms-parser.c	Sun Dec 14 21:58:11 2008
@@ -23,7 +23,7 @@
 
 #include <goffice/goffice-config.h>
 #include <goffice/ms-compat/go-ms-parser.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gsf/gsf-input.h>
 #include <gsf/gsf-utils.h>
 

Modified: trunk/goffice/ms-compat/god-drawing-ms.c
==============================================================================
--- trunk/goffice/ms-compat/god-drawing-ms.c	(original)
+++ trunk/goffice/ms-compat/god-drawing-ms.c	Sun Dec 14 21:58:11 2008
@@ -27,7 +27,7 @@
 #include <goffice/ms-compat/god-image-ms.h>
 #include <goffice/drawing/god-property-table.h>
 #include <goffice/drawing/god-shape.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gsf/gsf-input.h>
 #include <gsf/gsf-utils.h>
 #include <string.h>

Modified: trunk/goffice/utils/go-color.c
==============================================================================
--- trunk/goffice/utils/go-color.c	(original)
+++ trunk/goffice/utils/go-color.c	Sun Dec 14 21:58:11 2008
@@ -71,7 +71,7 @@
 }
 
 #ifdef GOFFICE_WITH_GTK
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 GdkColor *
 go_color_to_gdk	(GOColor color, GdkColor *res)

Modified: trunk/goffice/utils/go-color.h
==============================================================================
--- trunk/goffice/utils/go-color.h	(original)
+++ trunk/goffice/utils/go-color.h	Sun Dec 14 21:58:11 2008
@@ -32,7 +32,7 @@
 #include <pango/pango.h>
 
 #ifdef GOFFICE_WITH_GTK
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #endif
 
 G_BEGIN_DECLS

Modified: trunk/plugins/plot_barcol/gog-1.5d.c
==============================================================================
--- trunk/plugins/plot_barcol/gog-1.5d.c	(original)
+++ trunk/plugins/plot_barcol/gog-1.5d.c	Sun Dec 14 21:58:11 2008
@@ -558,7 +558,7 @@
 }
 
 #ifdef GOFFICE_WITH_GTK
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 static void 
 gog_series1_5d_populate_editor (GogObject *obj,
 				GogEditor *editor,

Modified: trunk/plugins/plot_barcol/gog-barcol-prefs.c
==============================================================================
--- trunk/plugins/plot_barcol/gog-barcol-prefs.c	(original)
+++ trunk/plugins/plot_barcol/gog-barcol-prefs.c	Sun Dec 14 21:58:11 2008
@@ -24,8 +24,6 @@
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/app/go-plugin.h>
 
-#include <gtk/gtkspinbutton.h>
-
 GtkWidget *gog_barcol_plot_pref (GogBarColPlot *plot, GOCmdContext *cc);
 
 static void

Modified: trunk/plugins/plot_barcol/gog-minmax.c
==============================================================================
--- trunk/plugins/plot_barcol/gog-minmax.c	(original)
+++ trunk/plugins/plot_barcol/gog-minmax.c	Sun Dec 14 21:58:11 2008
@@ -33,6 +33,10 @@
 #include <glib/gi18n-lib.h>
 #include <gsf/gsf-impl-utils.h>
 
+#ifdef GOFFICE_WITH_GTK
+#include <goffice/gtk/goffice-gtk.h>
+#endif
+
 enum {
 	MINMAX_PROP_0,
 	MINMAX_PROP_GAP_PERCENTAGE,
@@ -159,8 +163,6 @@
 }
 
 #ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#include <gtk/gtkspinbutton.h>
 static void
 cb_gap_changed (GtkAdjustment *adj, GObject *minmax)
 {

Modified: trunk/plugins/plot_distrib/gog-boxplot.c
==============================================================================
--- trunk/plugins/plot_distrib/gog-boxplot.c	(original)
+++ trunk/plugins/plot_distrib/gog-boxplot.c	Sun Dec 14 21:58:11 2008
@@ -58,10 +58,6 @@
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
 #include <glade/glade-xml.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkenums.h>
 
 static void
 cb_gap_changed (GtkAdjustment *adj, GObject *boxplot)

Modified: trunk/plugins/plot_pie/gog-pie-prefs.c
==============================================================================
--- trunk/plugins/plot_pie/gog-pie-prefs.c	(original)
+++ trunk/plugins/plot_pie/gog-pie-prefs.c	Sun Dec 14 21:58:11 2008
@@ -24,8 +24,6 @@
 
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/app/go-plugin.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
 
 GtkWidget *gog_pie_series_element_pref   (GogPieSeriesElement *element, GOCmdContext *cc);
 

Modified: trunk/plugins/plot_radar/gog-radar.c
==============================================================================
--- trunk/plugins/plot_radar/gog-radar.c	(original)
+++ trunk/plugins/plot_radar/gog-radar.c	Sun Dec 14 21:58:11 2008
@@ -44,8 +44,6 @@
 
 #ifdef GOFFICE_WITH_GTK
 #include <goffice/gtk/goffice-gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcombobox.h>
 #endif
 
 typedef struct {

Modified: trunk/plugins/plot_surface/gog-xyz-prefs.c
==============================================================================
--- trunk/plugins/plot_surface/gog-xyz-prefs.c	(original)
+++ trunk/plugins/plot_surface/gog-xyz-prefs.c	Sun Dec 14 21:58:11 2008
@@ -24,8 +24,6 @@
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/app/go-plugin.h>
 
-#include <gtk/gtktogglebutton.h>
-
 #include <string.h>
 
 GtkWidget *gog_xyz_plot_pref   (GogXYZPlot *plot, GOCmdContext *cc);

Modified: trunk/plugins/plot_surface/gog-xyz-surface-prefs.c
==============================================================================
--- trunk/plugins/plot_surface/gog-xyz-surface-prefs.c	(original)
+++ trunk/plugins/plot_surface/gog-xyz-surface-prefs.c	Sun Dec 14 21:58:11 2008
@@ -24,8 +24,6 @@
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/app/go-plugin.h>
 
-#include <gtk/gtktogglebutton.h>
-
 #include <string.h>
 
 GtkWidget *gog_xyz_surface_plot_pref   (GogXYZSurfacePlot *plot, GOCmdContext *cc);

Modified: trunk/plugins/plot_xy/gog-bubble-prefs.c
==============================================================================
--- trunk/plugins/plot_xy/gog-bubble-prefs.c	(original)
+++ trunk/plugins/plot_xy/gog-bubble-prefs.c	Sun Dec 14 21:58:11 2008
@@ -24,10 +24,6 @@
 #include <goffice/gtk/goffice-gtk.h>
 #include <goffice/app/go-plugin.h>
 
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-
 #include <string.h>
 
 GtkWidget *gog_bubble_plot_pref   (GogBubblePlot *bubble, GOCmdContext *cc);

Modified: trunk/plugins/reg_linear/gog-polynom-reg.c
==============================================================================
--- trunk/plugins/reg_linear/gog-polynom-reg.c	(original)
+++ trunk/plugins/reg_linear/gog-polynom-reg.c	Sun Dec 14 21:58:11 2008
@@ -183,9 +183,7 @@
 }
 
 #ifdef GOFFICE_WITH_GTK
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 static void
 order_changed_cb (GtkSpinButton *btn, GObject *obj)
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]