[ghex] Use only Glib/GTK+ single includes

[Javier Jardón <jjardon src gnome org>]

commit 5876354dc850aecf6c17ce2c1dce722ec07d4439
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Feb 7 20:52:13 2010 +0100

    Use only Glib/GTK+ single includes

 src/accessiblegtkhex.c        |   15 ++++++++-------
 src/accessiblegtkhex.h        |    2 +-
 src/accessiblegtkhexfactory.c |    3 ++-
 src/accessiblegtkhexfactory.h |    2 +-
 src/gnome-print-font-dialog.c |   15 +++------------
 src/gnome-print-font-picker.c |   18 ++----------------
 src/gnome-print-font-picker.h |    3 +--
 src/hex-document.h            |    2 +-
 src/ui.c                      |    2 +-
 9 files changed, 20 insertions(+), 42 deletions(-)
---
diff --git a/src/accessiblegtkhex.c b/src/accessiblegtkhex.c
index d107222..e3d349a 100644
--- a/src/accessiblegtkhex.c
+++ b/src/accessiblegtkhex.c
@@ -21,18 +21,19 @@
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
 
+#include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
-#include <sys/types.h>
-#include <bonobo.h>
+#include <atk/atk.h>
 #include <libgail-util/gailmisc.h>
-#include <atk/atkobject.h>
 
-#include <accessiblegtkhex.h>
-#include <gtkhex.h>
-#include <gtkhex-private.h>
+#include <bonobo.h>
+
+#include "accessiblegtkhex.h"
+#include "gtkhex.h"
+#include "gtkhex-private.h"
 
 static void accessible_gtk_hex_class_init       (AccessibleGtkHexClass *klass);
 
diff --git a/src/accessiblegtkhex.h b/src/accessiblegtkhex.h
index f785d15..c713524 100644
--- a/src/accessiblegtkhex.h
+++ b/src/accessiblegtkhex.h
@@ -20,7 +20,7 @@
 #ifndef __ACCESSIBLE_GTK_HEX_H__
 #define __ACCESSIBLE_GTK_HEX_H__
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include <libgail-util/gailtextutil.h>
 
 #ifdef __cplusplus
diff --git a/src/accessiblegtkhexfactory.c b/src/accessiblegtkhexfactory.c
index d97c177..c6cbbb3 100644
--- a/src/accessiblegtkhexfactory.c
+++ b/src/accessiblegtkhexfactory.c
@@ -20,7 +20,8 @@
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
+
 #include "accessiblegtkhexfactory.h"
 #include "accessiblegtkhex.h"
 
diff --git a/src/accessiblegtkhexfactory.h b/src/accessiblegtkhexfactory.h
index 97e8438..e57cf01 100644
--- a/src/accessiblegtkhexfactory.h
+++ b/src/accessiblegtkhexfactory.h
@@ -20,7 +20,7 @@
 #ifndef __ACCESSIBLE_GTK_HEX_FACTORY_H__
 #define __ACCESSIBLE_GTK_HEX_FACTORY_H__
 
-#include <atk/atkobjectfactory.h>
+#include <atk/atk.h>
 #include <gtkhex.h>
 
 #ifdef __cplusplus
diff --git a/src/gnome-print-font-dialog.c b/src/gnome-print-font-dialog.c
index 5d35412..c65e782 100644
--- a/src/gnome-print-font-dialog.c
+++ b/src/gnome-print-font-dialog.c
@@ -31,20 +31,11 @@
 
 #include <string.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkaccessible.h>
-#include <atk/atk.h>
-
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <atk/atk.h>
 
-#include <gnome-print-font-dialog.h>
+#include "gnome-print-font-dialog.h"
 
 void ghex_utils_set_atk_relation (  GtkWidget *obj1, GtkWidget *obj2, AtkRelationType rel_type );
 
diff --git a/src/gnome-print-font-picker.c b/src/gnome-print-font-picker.c
index dbdf04c..452d0ec 100644
--- a/src/gnome-print-font-picker.c
+++ b/src/gnome-print-font-picker.c
@@ -42,24 +42,10 @@
 
 #include <config.h>
 
-/* Must be before all other gnome includes!! */
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkfontsel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
-
-#include <gnome-print-font-dialog.h>
-/*
-#include "gnometypebuiltins.h"
-*/
-
+#include "gnome-print-font-dialog.h"
 #include "gnome-print-font-picker.h"
 
 #include <string.h>
diff --git a/src/gnome-print-font-picker.h b/src/gnome-print-font-picker.h
index 18e12ce..c174e93 100644
--- a/src/gnome-print-font-picker.h
+++ b/src/gnome-print-font-picker.h
@@ -43,7 +43,7 @@
 #ifndef GNOME_PRINT_FONT_PICKER_H
 #define GNOME_PRINT_FONT_PICKER_H
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include <libgnomeprint/gnome-font.h>
 
 
@@ -129,7 +129,6 @@ const gchar 	*gnome_print_font_picker_get_font_name	(GnomePrintFontPicker *gfp);
 
 gboolean   	 gnome_print_font_picker_set_font_name	(GnomePrintFontPicker *gfp,
                                                	     	 const gchar *fontname);
-#include <gtk/gtkbutton.h>
 
 const gchar	*gnome_print_font_picker_get_preview_text (GnomePrintFontPicker *gfp);
 
diff --git a/src/hex-document.h b/src/hex-document.h
index 39368ed..1007add 100644
--- a/src/hex-document.h
+++ b/src/hex-document.h
@@ -25,9 +25,9 @@
 #define __HEX_DOCUMENT_H__
 
 #include <stdio.h>
-#include <gtk/gtkwidget.h>
 
 #include <glib-object.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ui.c b/src/ui.c
index 131672e..fbd0436 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <unistd.h> /* for F_OK and W_OK */
 
-#include <gtk/gtkaboutdialog.h>
+#include <gtk/gtk.h>
 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprintui/gnome-print-dialog.h>