gtkhtml r8858 - in trunk: . a11y components/editor components/html-editor gtkhtml

From: mbarnes svn gnome org
To: svn-commits-list gnome org
Subject: gtkhtml r8858 - in trunk: . a11y components/editor components/html-editor gtkhtml
Date: Fri, 6 Jun 2008 13:33:00 +0000 (UTC)
Author: mbarnes
Date: Fri Jun  6 13:32:59 2008
New Revision: 8858
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8858&view=rev

Log:
2008-06-06  Matthew Barnes  <mbarnes redhat com>

	** Allow gtkhtml to build with G_DISABLE_SINGLE_INCLUDES and
	   GTK_DISABLE_SINGLE_INCLUDES defined.  (#536635)



Modified:
   trunk/ChangeLog
   trunk/a11y/object.h
   trunk/a11y/text.c
   trunk/components/editor/gtkhtml-editor-signals.c
   trunk/components/html-editor/editor-control-factory.c
   trunk/components/html-editor/engine.h
   trunk/components/html-editor/gi-color-combo.c
   trunk/components/html-editor/gi-color-combo.h
   trunk/components/html-editor/gi-color-group.c
   trunk/components/html-editor/gi-color-group.h
   trunk/components/html-editor/gi-color-palette.c
   trunk/components/html-editor/gi-color-palette.h
   trunk/components/html-editor/gi-colors.c
   trunk/components/html-editor/gi-colors.h
   trunk/components/html-editor/gi-combo-box.c
   trunk/components/html-editor/gi-combo-box.h
   trunk/components/html-editor/htmlsourceview.c
   trunk/components/html-editor/htmlsourceview.h
   trunk/components/html-editor/menubar.c
   trunk/gtkhtml/gtkhtml-embedded.c
   trunk/gtkhtml/gtkhtml-embedded.h
   trunk/gtkhtml/gtkhtml-private.h
   trunk/gtkhtml/gtkhtml-properties.h
   trunk/gtkhtml/gtkhtml-search.c
   trunk/gtkhtml/gtkhtml.c
   trunk/gtkhtml/gtkhtml.h
   trunk/gtkhtml/htmlbutton.c
   trunk/gtkhtml/htmlcheckbox.c
   trunk/gtkhtml/htmlcolor.c
   trunk/gtkhtml/htmlcolor.h
   trunk/gtkhtml/htmlcolorset.c
   trunk/gtkhtml/htmlcolorset.h
   trunk/gtkhtml/htmldrawqueue.c
   trunk/gtkhtml/htmldrawqueue.h
   trunk/gtkhtml/htmlembedded.h
   trunk/gtkhtml/htmlengine-edit-cursor.c
   trunk/gtkhtml/htmlengine-edit-selection-updater.c
   trunk/gtkhtml/htmlengine.c
   trunk/gtkhtml/htmlengine.h
   trunk/gtkhtml/htmlform.h
   trunk/gtkhtml/htmlgdkpainter.c
   trunk/gtkhtml/htmlgdkpainter.h
   trunk/gtkhtml/htmlimage.c
   trunk/gtkhtml/htmlimage.h
   trunk/gtkhtml/htmlobject.c
   trunk/gtkhtml/htmlobject.h
   trunk/gtkhtml/htmlpainter.h
   trunk/gtkhtml/htmlprinter.c
   trunk/gtkhtml/htmlradio.c
   trunk/gtkhtml/htmlselect.c
   trunk/gtkhtml/htmlselect.h
   trunk/gtkhtml/htmlselection.c
   trunk/gtkhtml/htmltablecell.h
   trunk/gtkhtml/htmltextarea.c
   trunk/gtkhtml/htmltextarea.h
   trunk/gtkhtml/htmltextinput.c
   trunk/gtkhtml/htmltokenizer.c
   trunk/gtkhtml/test-stress.c
   trunk/gtkhtml/test-suite.c
   trunk/gtkhtml/test.c
   trunk/gtkhtml/testgtkhtml.c

Modified: trunk/a11y/object.h
==============================================================================
--- trunk/a11y/object.h	(original)
+++ trunk/a11y/object.h	Fri Jun  6 13:32:59 2008
@@ -24,7 +24,7 @@
 #ifndef __GTK_HTML_A11Y_OBJECT_H__
 #define __GTK_HTML_A11Y_OBJECT_H__
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 
 #define G_TYPE_GTK_HTML_A11Y                     (gtk_html_a11y_get_type ())
 #define GTK_HTML_A11Y(obj)                       (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_GTK_HTML_A11Y, GtkHTMLA11Y))

Modified: trunk/a11y/text.c
==============================================================================
--- trunk/a11y/text.c	(original)
+++ trunk/a11y/text.c	Fri Jun  6 13:32:59 2008
@@ -27,7 +27,6 @@
 #include <atk/atkhypertext.h>
 #include <atk/atkhyperlink.h>
 #include <glib/gi18n-lib.h>
-#include <glib/gmacros.h>
 #include <pango/pango.h>
 #include "gtkhtml.h"
 #include "htmlengine.h"

Modified: trunk/components/editor/gtkhtml-editor-signals.c
==============================================================================
--- trunk/components/editor/gtkhtml-editor-signals.c	(original)
+++ trunk/components/editor/gtkhtml-editor-signals.c	Fri Jun  6 13:32:59 2008
@@ -294,7 +294,7 @@
                               GtkWidget *widget)
 {
 	GtkHTML *html;
-	gboolean sensitive;;
+	gboolean sensitive;
 	gint active;
 	gint value;
 

Modified: trunk/components/html-editor/editor-control-factory.c
==============================================================================
--- trunk/components/html-editor/editor-control-factory.c	(original)
+++ trunk/components/html-editor/editor-control-factory.c	Fri Jun  6 13:32:59 2008
@@ -36,7 +36,6 @@
 #include <gtk/gtk.h>
 #include <bonobo.h>
 #include <stdio.h>
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -48,8 +47,6 @@
 #define O_BINARY 0
 #endif
 
-#include <gtk/gtkscrolledwindow.h>
-
 #include <glade/glade.h>
 
 #include "Editor.h"

Modified: trunk/components/html-editor/engine.h
==============================================================================
--- trunk/components/html-editor/engine.h	(original)
+++ trunk/components/html-editor/engine.h	Fri Jun  6 13:32:59 2008
@@ -27,7 +27,7 @@
 
 typedef struct _EditorEngine EditorEngine;
 
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
 #include <bonobo/bonobo-object.h>
 #include "Editor.h"
 #include "control-data.h"

Modified: trunk/components/html-editor/gi-color-combo.c
==============================================================================
--- trunk/components/html-editor/gi-color-combo.c	(original)
+++ trunk/components/html-editor/gi-color-combo.c	Fri Jun  6 13:32:59 2008
@@ -30,8 +30,6 @@
 
 #include <config.h>
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>

Modified: trunk/components/html-editor/gi-color-combo.h
==============================================================================
--- trunk/components/html-editor/gi-color-combo.h	(original)
+++ trunk/components/html-editor/gi-color-combo.h	Fri Jun  6 13:32:59 2008
@@ -31,7 +31,7 @@
 #ifndef GI_COLOR_COMBO_H
 #define GI_COLOR_COMBO_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "gi-combo-box.h"
 #include "gi-color-palette.h"
 

Modified: trunk/components/html-editor/gi-color-group.c
==============================================================================
--- trunk/components/html-editor/gi-color-group.c	(original)
+++ trunk/components/html-editor/gi-color-group.c	Fri Jun  6 13:32:59 2008
@@ -26,8 +26,6 @@
  */
 
 #include <string.h>
-#include <glib-object.h>
-#include <gdk/gdkcolor.h>
 #include "gi-color-group.h"
 #include "gi-utils.h"
 

Modified: trunk/components/html-editor/gi-color-group.h
==============================================================================
--- trunk/components/html-editor/gi-color-group.h	(original)
+++ trunk/components/html-editor/gi-color-group.h	Fri Jun  6 13:32:59 2008
@@ -28,9 +28,7 @@
 #ifndef GNOME_APP_LIB__COLOR_GROUP_H
 #define GNOME_APP_LIB__COLOR_GROUP_H
 
-#include <glib-object.h>
-#include <glib.h>
-#include <gdk/gdktypes.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/components/html-editor/gi-color-palette.c
==============================================================================
--- trunk/components/html-editor/gi-color-palette.c	(original)
+++ trunk/components/html-editor/gi-color-palette.c	Fri Jun  6 13:32:59 2008
@@ -29,9 +29,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktable.h>
 #ifdef GNOME_GTKHTML_EDITOR_SHLIB
 #include <glib/gi18n-lib.h>
 #else
@@ -39,7 +36,6 @@
 #endif
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <gdk/gdkcolor.h>
 #include "gi-color-group.h"
 #include "gi-color-palette.h"
 #include "gi-colors.h"

Modified: trunk/components/html-editor/gi-color-palette.h
==============================================================================
--- trunk/components/html-editor/gi-color-palette.h	(original)
+++ trunk/components/html-editor/gi-color-palette.h	Fri Jun  6 13:32:59 2008
@@ -30,10 +30,7 @@
 #ifndef GI_COLOR_PALETTE_H
 #define GI_COLOR_PALETTE_H
 
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include "gi-color-group.h"
 

Modified: trunk/components/html-editor/gi-colors.c
==============================================================================
--- trunk/components/html-editor/gi-colors.c	(original)
+++ trunk/components/html-editor/gi-colors.c	Fri Jun  6 13:32:59 2008
@@ -32,8 +32,6 @@
 #undef GDK_DISABLE_DEPRECATED
 #endif
 
-#include <gdk/gdkrgb.h>
-#include <gtk/gtkwidget.h>
 #include "gi-colors.h"
 
 GdkColor e_white, e_dark_gray, e_black;

Modified: trunk/components/html-editor/gi-colors.h
==============================================================================
--- trunk/components/html-editor/gi-colors.h	(original)
+++ trunk/components/html-editor/gi-colors.h	Fri Jun  6 13:32:59 2008
@@ -24,9 +24,7 @@
 #ifndef GNOME_APP_LIBS_COLOR_H
 #define GNOME_APP_LIBS_COLOR_H
 
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/components/html-editor/gi-combo-box.c
==============================================================================
--- trunk/components/html-editor/gi-combo-box.c	(original)
+++ trunk/components/html-editor/gi-combo-box.c	Fri Jun  6 13:32:59 2008
@@ -25,20 +25,7 @@
  */
 
 #include <config.h>
-#include <gdk/gdkwindow.h>
-#include <gdk/gdkdrawable.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktearoffmenuitem.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkcursor.h>
 #ifdef GNOME_GTKHTML_EDITOR_SHLIB
 #include <glib/gi18n-lib.h>
 #else

Modified: trunk/components/html-editor/gi-combo-box.h
==============================================================================
--- trunk/components/html-editor/gi-combo-box.h	(original)
+++ trunk/components/html-editor/gi-combo-box.h	Fri Jun  6 13:32:59 2008
@@ -24,7 +24,7 @@
 #ifndef GI_COMBO_BOX_H
 #define GI_COMBO_BOX_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/components/html-editor/htmlsourceview.c
==============================================================================
--- trunk/components/html-editor/htmlsourceview.c	(original)
+++ trunk/components/html-editor/htmlsourceview.c	Fri Jun  6 13:32:59 2008
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <gtk/gtk.h>
 #include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-stream.h>
 #include <bonobo/bonobo-stream-memory.h>

Modified: trunk/components/html-editor/htmlsourceview.h
==============================================================================
--- trunk/components/html-editor/htmlsourceview.h	(original)
+++ trunk/components/html-editor/htmlsourceview.h	Fri Jun  6 13:32:59 2008
@@ -22,7 +22,7 @@
 #ifndef __HTML_SOURCE_VIEW__
 #define __HTML_SOURCE_VIEW__
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <bonobo.h>
 #include "gtkhtml.h"
 

Modified: trunk/components/html-editor/menubar.c
==============================================================================
--- trunk/components/html-editor/menubar.c	(original)
+++ trunk/components/html-editor/menubar.c	Fri Jun  6 13:32:59 2008
@@ -33,8 +33,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 #include <bonobo.h>
 
 #include "htmlengine.h"

Modified: trunk/gtkhtml/gtkhtml-embedded.c
==============================================================================
--- trunk/gtkhtml/gtkhtml-embedded.c	(original)
+++ trunk/gtkhtml/gtkhtml-embedded.c	Fri Jun  6 13:32:59 2008
@@ -22,7 +22,6 @@
  */
 
 #include <config.h>
-#include <gnome.h>
 
 #include "gtkhtml-embedded.h"
 #include "htmlengine.h"

Modified: trunk/gtkhtml/gtkhtml-embedded.h
==============================================================================
--- trunk/gtkhtml/gtkhtml-embedded.h	(original)
+++ trunk/gtkhtml/gtkhtml-embedded.h	Fri Jun  6 13:32:59 2008
@@ -23,7 +23,7 @@
 #ifndef _GTK_HTML_EMBEDDED_H
 #define _GTK_HTML_EMBEDDED_H
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 #include "gtkhtml-types.h"
 

Modified: trunk/gtkhtml/gtkhtml-private.h
==============================================================================
--- trunk/gtkhtml/gtkhtml-private.h	(original)
+++ trunk/gtkhtml/gtkhtml-private.h	Fri Jun  6 13:32:59 2008
@@ -22,8 +22,7 @@
 #ifndef _GTKHTML_PRIVATE_H
 #define _GTKHTML_PRIVATE_H
 
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "gtkhtml-types.h"
 #include "htmltypes.h"
 

Modified: trunk/gtkhtml/gtkhtml-properties.h
==============================================================================
--- trunk/gtkhtml/gtkhtml-properties.h	(original)
+++ trunk/gtkhtml/gtkhtml-properties.h	Fri Jun  6 13:32:59 2008
@@ -26,12 +26,9 @@
 #define GTK_HTML_GCONF_DIR "/GNOME/Documents/HTML_Editor"
 #define GTK_HTML_GNOME_CONFIG_PREFIX "/gtkhtml/Settings/"
 
-#include <glib.h>
-#include <gdk/gdktypes.h>
-
+#include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
-#include <gtk/gtkobject.h>
 #include "gtkhtml-types.h"
 #include "gtkhtml.h"
 

Modified: trunk/gtkhtml/gtkhtml-search.c
==============================================================================
--- trunk/gtkhtml/gtkhtml-search.c	(original)
+++ trunk/gtkhtml/gtkhtml-search.c	Fri Jun  6 13:32:59 2008
@@ -21,11 +21,8 @@
 */
 
 #include <config.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkobject.h>
 #include "gtkhtml.h"
 #include "gtkhtml-private.h"
 #include "gtkhtml-search.h"

Modified: trunk/gtkhtml/gtkhtml.c
==============================================================================
--- trunk/gtkhtml/gtkhtml.c	(original)
+++ trunk/gtkhtml/gtkhtml.c	Fri Jun  6 13:32:59 2008
@@ -23,15 +23,9 @@
 #include <ctype.h>
 
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkprivate.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 
-#include <gnome.h>
-
 #include "../a11y/factory.h"
 
 #include "htmlcolorset.h"

Modified: trunk/gtkhtml/gtkhtml.h
==============================================================================
--- trunk/gtkhtml/gtkhtml.h	(original)
+++ trunk/gtkhtml/gtkhtml.h	Fri Jun  6 13:32:59 2008
@@ -23,8 +23,6 @@
 #define _GTKHTML_H_
 
 #include <sys/types.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtkbindings.h>
 
 #include "gtkhtml-types.h"
 #include "gtkhtml-enums.h"

Modified: trunk/gtkhtml/htmlbutton.c
==============================================================================
--- trunk/gtkhtml/htmlbutton.c	(original)
+++ trunk/gtkhtml/htmlbutton.c	Fri Jun  6 13:32:59 2008
@@ -20,8 +20,7 @@
 */
 
 #include <config.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include "htmlbutton.h"
 #include "htmlform.h"
 #include <string.h>

Modified: trunk/gtkhtml/htmlcheckbox.c
==============================================================================
--- trunk/gtkhtml/htmlcheckbox.c	(original)
+++ trunk/gtkhtml/htmlcheckbox.c	Fri Jun  6 13:32:59 2008
@@ -20,8 +20,7 @@
 */
 
 #include <config.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 #include "htmlcheckbox.h"
 #include <string.h>
 

Modified: trunk/gtkhtml/htmlcolor.c
==============================================================================
--- trunk/gtkhtml/htmlcolor.c	(original)
+++ trunk/gtkhtml/htmlcolor.c	Fri Jun  6 13:32:59 2008
@@ -22,7 +22,6 @@
 */
 
 #include <config.h>
-#include <gdk/gdk.h>
 
 #include "htmlcolor.h"
 #include "htmlpainter.h"

Modified: trunk/gtkhtml/htmlcolor.h
==============================================================================
--- trunk/gtkhtml/htmlcolor.h	(original)
+++ trunk/gtkhtml/htmlcolor.h	Fri Jun  6 13:32:59 2008
@@ -23,8 +23,7 @@
 #ifndef _HTML_COLOR_H_
 #define _HTML_COLOR_H_
 
-#include <gdk/gdktypes.h>
-#include <gdk/gdkcolor.h>
+#include <gtk/gtk.h>
 #include "htmltypes.h"
 
 struct _HTMLColor {

Modified: trunk/gtkhtml/htmlcolorset.c
==============================================================================
--- trunk/gtkhtml/htmlcolorset.c	(original)
+++ trunk/gtkhtml/htmlcolorset.c	Fri Jun  6 13:32:59 2008
@@ -20,7 +20,6 @@
 */
 
 #include <config.h>
-#include <gtk/gtkwidget.h>
 #include "htmlcolor.h"
 #include "htmlcolorset.h"
 #include "htmlpainter.h"

Modified: trunk/gtkhtml/htmlcolorset.h
==============================================================================
--- trunk/gtkhtml/htmlcolorset.h	(original)
+++ trunk/gtkhtml/htmlcolorset.h	Fri Jun  6 13:32:59 2008
@@ -22,7 +22,7 @@
 #ifndef _HTMLCOLORSET_H_
 #define _HTMLCOLORSET_H_
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "htmltypes.h"
 #include "htmlenums.h"
 

Modified: trunk/gtkhtml/htmldrawqueue.c
==============================================================================
--- trunk/gtkhtml/htmldrawqueue.c	(original)
+++ trunk/gtkhtml/htmldrawqueue.c	Fri Jun  6 13:32:59 2008
@@ -20,7 +20,6 @@
 */
 
 #include <config.h>
-#include <gtk/gtksignal.h>
 #include "htmlengine-edit-cursor.h"
 #include "htmlcolor.h"
 #include "htmldrawqueue.h"

Modified: trunk/gtkhtml/htmldrawqueue.h
==============================================================================
--- trunk/gtkhtml/htmldrawqueue.h	(original)
+++ trunk/gtkhtml/htmldrawqueue.h	Fri Jun  6 13:32:59 2008
@@ -21,9 +21,8 @@
 #ifndef _HTMLDRAWQUEUE_H
 #define _HTMLDRAWQUEUE_H
 
+#include <gtk/gtk.h>
 #include "htmltypes.h"
-#include <gdk/gdktypes.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 struct _HTMLDrawQueueClearElement {
 	gint x, y;

Modified: trunk/gtkhtml/htmlembedded.h
==============================================================================
--- trunk/gtkhtml/htmlembedded.h	(original)
+++ trunk/gtkhtml/htmlembedded.h	Fri Jun  6 13:32:59 2008
@@ -21,7 +21,7 @@
 #ifndef HTMLEMBEDDED_H
 #define HTMLEMBEDDED_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "htmlobject.h"
 
 #define HTML_EMBEDDED(x) ((HTMLEmbedded *)(x))

Modified: trunk/gtkhtml/htmlengine-edit-cursor.c
==============================================================================
--- trunk/gtkhtml/htmlengine-edit-cursor.c	(original)
+++ trunk/gtkhtml/htmlengine-edit-cursor.c	Fri Jun  6 13:32:59 2008
@@ -20,7 +20,7 @@
 */
 
 #include <config.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include "gtkhtml.h"
 #include "gtkhtml-private.h"
 #include "htmlcursor.h"

Modified: trunk/gtkhtml/htmlengine-edit-selection-updater.c
==============================================================================
--- trunk/gtkhtml/htmlengine-edit-selection-updater.c	(original)
+++ trunk/gtkhtml/htmlengine-edit-selection-updater.c	Fri Jun  6 13:32:59 2008
@@ -25,7 +25,7 @@
 
 
 #include <config.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include "htmlengine-edit-selection-updater.h"
 #include "htmlinterval.h"
 #include "htmlselection.h"

Modified: trunk/gtkhtml/htmlengine.c
==============================================================================
--- trunk/gtkhtml/htmlengine.c	(original)
+++ trunk/gtkhtml/htmlengine.c	Fri Jun  6 13:32:59 2008
@@ -36,12 +36,6 @@
 #include <ctype.h>
 #include <time.h>
 
-#include <glib.h>
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-
 #include "gtkhtml-embedded.h"
 #include "gtkhtml-private.h"
 #include "gtkhtml-properties.h"

Modified: trunk/gtkhtml/htmlengine.h
==============================================================================
--- trunk/gtkhtml/htmlengine.h	(original)
+++ trunk/gtkhtml/htmlengine.h	Fri Jun  6 13:32:59 2008
@@ -24,9 +24,7 @@
 #ifndef _HTMLENGINE_H_
 #define _HTMLENGINE_H_
 
-#include <glib-object.h>
-#include <gdk/gdktypes.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "gtkhtml-types.h"
 
 #include "htmltypes.h"

Modified: trunk/gtkhtml/htmlform.h
==============================================================================
--- trunk/gtkhtml/htmlform.h	(original)
+++ trunk/gtkhtml/htmlform.h	Fri Jun  6 13:32:59 2008
@@ -21,8 +21,7 @@
 #ifndef _HTMLFORM_H_
 #define _HTMLFORM_H_
 
-#include <glib.h>
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 #include "htmlembedded.h"
 #include "htmlhidden.h"
 

Modified: trunk/gtkhtml/htmlgdkpainter.c
==============================================================================
--- trunk/gtkhtml/htmlgdkpainter.c	(original)
+++ trunk/gtkhtml/htmlgdkpainter.c	Fri Jun  6 13:32:59 2008
@@ -25,11 +25,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-#include <gdk/gdkgc.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtksignal.h>
-
 #include <glib/gi18n-lib.h>
 
 #include "htmlentity.h"

Modified: trunk/gtkhtml/htmlgdkpainter.h
==============================================================================
--- trunk/gtkhtml/htmlgdkpainter.h	(original)
+++ trunk/gtkhtml/htmlgdkpainter.h	Fri Jun  6 13:32:59 2008
@@ -22,11 +22,7 @@
 #ifndef _HTMLGDKPAINTER_H
 #define _HTMLGDKPAINTER_H
 
-#include <pango/pango-context.h>
-#include <pango/pango-layout.h>
-
-#include <gtk/gtkwidget.h>
-
+#include <gtk/gtk.h>
 #include "htmlpainter.h"
 #include "htmlfontmanager.h"
 

Modified: trunk/gtkhtml/htmlimage.c
==============================================================================
--- trunk/gtkhtml/htmlimage.c	(original)
+++ trunk/gtkhtml/htmlimage.c	Fri Jun  6 13:32:59 2008
@@ -24,13 +24,7 @@
 */
 
 #include <config.h>
-#include <glib.h>
 #include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtk.h>
 
 #include "gtkhtml.h"
 #include "gtkhtml-properties.h"

Modified: trunk/gtkhtml/htmlimage.h
==============================================================================
--- trunk/gtkhtml/htmlimage.h	(original)
+++ trunk/gtkhtml/htmlimage.h	Fri Jun  6 13:32:59 2008
@@ -23,8 +23,7 @@
 #ifndef _HTMLIMAGE_H_
 #define _HTMLIMAGE_H_
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-loader.h>
+#include <gtk/gtk.h>
 #include "htmlobject.h"
 
 #define HTML_IMAGE_FACTORY(x) ((HTMLImageFactory *)(x))

Modified: trunk/gtkhtml/htmlobject.c
==============================================================================
--- trunk/gtkhtml/htmlobject.c	(original)
+++ trunk/gtkhtml/htmlobject.c	Fri Jun  6 13:32:59 2008
@@ -23,8 +23,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gdataset.h>
-#include <glib/gquark.h>
 
 #include "htmlclue.h"
 #include "htmlclueflow.h"

Modified: trunk/gtkhtml/htmlobject.h
==============================================================================
--- trunk/gtkhtml/htmlobject.h	(original)
+++ trunk/gtkhtml/htmlobject.h	Fri Jun  6 13:32:59 2008
@@ -25,7 +25,7 @@
 #define _HTMLOBJECT_H_
 
 #include <libart_lgpl/art_rect.h>
-#include <gdk/gdktypes.h>
+#include <gtk/gtk.h>
 #include "htmltypes.h"
 #include "htmlenums.h"
 

Modified: trunk/gtkhtml/htmlpainter.h
==============================================================================
--- trunk/gtkhtml/htmlpainter.h	(original)
+++ trunk/gtkhtml/htmlpainter.h	Fri Jun  6 13:32:59 2008
@@ -24,10 +24,7 @@
 #ifndef _HTMLPAINTER_H_
 #define _HTMLPAINTER_H_
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdktypes.h>
-#include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "gtkhtml-enums.h"
 #include "htmltypes.h"

Modified: trunk/gtkhtml/htmlprinter.c
==============================================================================
--- trunk/gtkhtml/htmlprinter.c	(original)
+++ trunk/gtkhtml/htmlprinter.c	Fri Jun  6 13:32:59 2008
@@ -23,8 +23,6 @@
 #include "gtkhtml-compat.h"
 
 #include <string.h>
-#include <gtk/gtk.h>
-#include <gnome.h>
 #include <ctype.h>
 
 #include "htmlembedded.h"

Modified: trunk/gtkhtml/htmlradio.c
==============================================================================
--- trunk/gtkhtml/htmlradio.c	(original)
+++ trunk/gtkhtml/htmlradio.c	Fri Jun  6 13:32:59 2008
@@ -20,7 +20,7 @@
 */
 
 #include <config.h>
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 #include "htmlform.h"
 #include "htmlradio.h"
 #include <string.h>

Modified: trunk/gtkhtml/htmlselect.c
==============================================================================
--- trunk/gtkhtml/htmlselect.c	(original)
+++ trunk/gtkhtml/htmlselect.c	Fri Jun  6 13:32:59 2008
@@ -22,13 +22,6 @@
 
 #include <config.h>
 
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkcellrenderertext.h>
 #include "htmlselect.h"
 #include <string.h>
 

Modified: trunk/gtkhtml/htmlselect.h
==============================================================================
--- trunk/gtkhtml/htmlselect.h	(original)
+++ trunk/gtkhtml/htmlselect.h	Fri Jun  6 13:32:59 2008
@@ -21,7 +21,7 @@
 #ifndef _HTMLSELECT_H_
 #define _HTMLSELECT_H_
 
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include "htmlembedded.h"
 
 #define HTML_SELECT(x) ((HTMLSelect *) (x))

Modified: trunk/gtkhtml/htmlselection.c
==============================================================================
--- trunk/gtkhtml/htmlselection.c	(original)
+++ trunk/gtkhtml/htmlselection.c	Fri Jun  6 13:32:59 2008
@@ -19,8 +19,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <gtk/gtkselection.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include "htmlcursor.h"
 #include "htmlengine-edit-cursor.h"

Modified: trunk/gtkhtml/htmltablecell.h
==============================================================================
--- trunk/gtkhtml/htmltablecell.h	(original)
+++ trunk/gtkhtml/htmltablecell.h	Fri Jun  6 13:32:59 2008
@@ -24,7 +24,7 @@
 #ifndef _HTMLTABLECELL_H_
 #define _HTMLTABLECELL_H_
 
-#include <gdk/gdkcolor.h>
+#include <gtk/gtk.h>
 
 #include "htmlcluev.h"
 #include "htmlimage.h"

Modified: trunk/gtkhtml/htmltextarea.c
==============================================================================
--- trunk/gtkhtml/htmltextarea.c	(original)
+++ trunk/gtkhtml/htmltextarea.c	Fri Jun  6 13:32:59 2008
@@ -21,10 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
 #include "htmltextarea.h"
 
 

Modified: trunk/gtkhtml/htmltextarea.h
==============================================================================
--- trunk/gtkhtml/htmltextarea.h	(original)
+++ trunk/gtkhtml/htmltextarea.h	Fri Jun  6 13:32:59 2008
@@ -21,7 +21,7 @@
 #ifndef _HTMLTEXTAREA_H_
 #define _HTMLTEXTAREA_H_
 
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 #include "htmlembedded.h"
 
 #define HTML_TEXTAREA(x) ((HTMLTextArea *) (x))

Modified: trunk/gtkhtml/htmltextinput.c
==============================================================================
--- trunk/gtkhtml/htmltextinput.c	(original)
+++ trunk/gtkhtml/htmltextinput.c	Fri Jun  6 13:32:59 2008
@@ -21,9 +21,8 @@
 
 #include <config.h>
 #include <string.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkentry.h>
 
 #include "htmltextinput.h"
 #include "htmlform.h"

Modified: trunk/gtkhtml/htmltokenizer.c
==============================================================================
--- trunk/gtkhtml/htmltokenizer.c	(original)
+++ trunk/gtkhtml/htmltokenizer.c	Fri Jun  6 13:32:59 2008
@@ -25,8 +25,8 @@
 /* The HTML Tokenizer */
 #include <config.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
-#include <gnome.h>
 #include "htmltokenizer.h"
 #include "htmlentity.h"
 

Modified: trunk/gtkhtml/test-stress.c
==============================================================================
--- trunk/gtkhtml/test-stress.c	(original)
+++ trunk/gtkhtml/test-stress.c	Fri Jun  6 13:32:59 2008
@@ -1,10 +1,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib/gstring.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "gtkhtml.h"
 #include "htmlclue.h"
 #include "htmlclueflow.h"

Modified: trunk/gtkhtml/test-suite.c
==============================================================================
--- trunk/gtkhtml/test-suite.c	(original)
+++ trunk/gtkhtml/test-suite.c	Fri Jun  6 13:32:59 2008
@@ -1,9 +1,6 @@
 #include <string.h>
 #include <stdio.h>
-#include <glib/gstring.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "gtkhtml.h"
 #include "htmlclue.h"
 #include "htmlclueflow.h"

Modified: trunk/gtkhtml/test.c
==============================================================================
--- trunk/gtkhtml/test.c	(original)
+++ trunk/gtkhtml/test.c	Fri Jun  6 13:32:59 2008
@@ -29,15 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtksignal.h>
-
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-ui-init.h>
 
@@ -46,7 +38,6 @@
 #include "gtkhtml-stream.h"
 
 #include "htmlengine.h"
-#include <gtk/gtk.h>
 
 typedef struct _Example Example;
 

Modified: trunk/gtkhtml/testgtkhtml.c
==============================================================================
--- trunk/gtkhtml/testgtkhtml.c	(original)
+++ trunk/gtkhtml/testgtkhtml.c	Fri Jun  6 13:32:59 2008
@@ -27,9 +27,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <gnome.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkbutton.h>
 
 #ifdef G_OS_WIN32
 /* Clashes with objidl.h, which gets included through a chain of includes from libsoup/soup.h */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]