summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2008-10-30 15:58:06 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-10-30 15:58:06 +0000
commite7b18d2a61adfba6f92d95007ebb5655b5ecc609 (patch)
tree71b398bbc9d700abf7bf7c7f36432ca465eb7ba8
parent2c32cdd8939aae1db1af1dc54876c83fe9e05b17 (diff)
downloadgtk+-e7b18d2a61adfba6f92d95007ebb5655b5ecc609.tar.gz
no need to include <gdk/gdk.h> in any widget header, it's included via
2008-10-30 Michael Natterer <mitch@imendio.com> * gtk/*.h: no need to include <gdk/gdk.h> in any widget header, it's included via gtkwidget.h anyway. svn path=/trunk/; revision=21732
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtkalignment.h1
-rw-r--r--gtk/gtkarrow.h1
-rw-r--r--gtk/gtkaspectframe.h2
-rw-r--r--gtk/gtkbin.h1
-rw-r--r--gtk/gtkbox.h1
-rw-r--r--gtk/gtkbutton.h1
-rw-r--r--gtk/gtkcalendar.h2
-rw-r--r--gtk/gtkcheckbutton.h1
-rw-r--r--gtk/gtkcheckmenuitem.h1
-rw-r--r--gtk/gtkclist.h3
-rw-r--r--gtk/gtkcontainer.h1
-rw-r--r--gtk/gtkcurve.h2
-rw-r--r--gtk/gtkdialog.h1
-rw-r--r--gtk/gtkdnd.h3
-rw-r--r--gtk/gtkdrawingarea.h1
-rw-r--r--gtk/gtkeditable.h2
-rw-r--r--gtk/gtkentry.h2
-rw-r--r--gtk/gtkeventbox.h1
-rw-r--r--gtk/gtkfixed.h1
-rw-r--r--gtk/gtkfontsel.h2
-rw-r--r--gtk/gtkframe.h1
-rw-r--r--gtk/gtkgamma.h1
-rw-r--r--gtk/gtkhandlebox.h1
-rw-r--r--gtk/gtkhbox.h1
-rw-r--r--gtk/gtkhruler.h1
-rw-r--r--gtk/gtkhscale.h1
-rw-r--r--gtk/gtkhscrollbar.h1
-rw-r--r--gtk/gtkhseparator.h1
-rw-r--r--gtk/gtkimage.h1
-rw-r--r--gtk/gtkimagemenuitem.h2
-rw-r--r--gtk/gtkinputdialog.h1
-rw-r--r--gtk/gtkitem.h1
-rw-r--r--gtk/gtklabel.h2
-rw-r--r--gtk/gtklayout.h3
-rw-r--r--gtk/gtkmenu.h1
-rw-r--r--gtk/gtkmenubar.h1
-rw-r--r--gtk/gtkmenuitem.h1
-rw-r--r--gtk/gtkmenushell.h1
-rw-r--r--gtk/gtkmisc.h5
-rw-r--r--gtk/gtknotebook.h2
-rw-r--r--gtk/gtkplug.h1
-rw-r--r--gtk/gtkprogress.h3
-rw-r--r--gtk/gtkprogressbar.h1
-rw-r--r--gtk/gtkradiobutton.h1
-rw-r--r--gtk/gtkradiomenuitem.h2
-rw-r--r--gtk/gtkrange.h1
-rw-r--r--gtk/gtkruler.h1
-rw-r--r--gtk/gtkscale.h1
-rw-r--r--gtk/gtkscrollbar.h1
-rw-r--r--gtk/gtkscrolledwindow.h1
-rw-r--r--gtk/gtkseparator.h1
-rw-r--r--gtk/gtkseparatormenuitem.h2
-rw-r--r--gtk/gtkspinbutton.h1
-rw-r--r--gtk/gtktable.h1
-rw-r--r--gtk/gtktearoffmenuitem.h2
-rw-r--r--gtk/gtktext.h3
-rw-r--r--gtk/gtkthemes.h7
-rw-r--r--gtk/gtktipsquery.h3
-rw-r--r--gtk/gtktogglebutton.h2
-rw-r--r--gtk/gtktoolbar.h2
-rw-r--r--gtk/gtktree.h8
-rw-r--r--gtk/gtktreeitem.h3
-rw-r--r--gtk/gtkvbox.h1
-rw-r--r--gtk/gtkviewport.h1
-rw-r--r--gtk/gtkvruler.h1
-rw-r--r--gtk/gtkvscale.h1
-rw-r--r--gtk/gtkvscrollbar.h1
-rw-r--r--gtk/gtkvseparator.h1
-rw-r--r--gtk/gtkwin32embedwidget.h5
-rw-r--r--gtk/gtkwindow.h3
71 files changed, 45 insertions, 81 deletions
diff --git a/ChangeLog b/ChangeLog
index 6feff1c1ac..a16d10dc32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-30 Michael Natterer <mitch@imendio.com>
+
+ * gtk/*.h: no need to include <gdk/gdk.h> in any widget header,
+ it's included via gtkwidget.h anyway.
+
2008-10-30 Sven Neumann <sven@gimp.org>
* gtk/gtkwidget.c (gtk_widget_get_property): removed redundant
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index f37359334a..4fad3027e3 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -32,7 +32,6 @@
#define __GTK_ALIGNMENT_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index fc5b8381c8..010e3ef227 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -32,7 +32,6 @@
#define __GTK_ARROW_H__
-#include <gdk/gdk.h>
#include <gtk/gtkmisc.h>
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 668c384008..d78ee87e3c 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -32,9 +32,9 @@
#define __GTK_ASPECT_FRAME_H__
-#include <gdk/gdk.h>
#include <gtk/gtkframe.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_ASPECT_FRAME (gtk_aspect_frame_get_type ())
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 6dd8c53e27..b80e111833 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -32,7 +32,6 @@
#define __GTK_BIN_H__
-#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 8167aa9374..914683b48e 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -32,7 +32,6 @@
#define __GTK_BOX_H__
-#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index a8c1e8e4ee..8d2dd45425 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -32,7 +32,6 @@
#define __GTK_BUTTON_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkimage.h>
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 76dd002724..9648d25be1 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -33,7 +33,7 @@
#ifndef __GTK_CALENDAR_H__
#define __GTK_CALENDAR_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtkwidget.h>
/* Not needed, retained for compatibility -Yosh */
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index 1b50086abe..54c6dcfa39 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@@ -32,7 +32,6 @@
#define __GTK_CHECK_BUTTON_H__
-#include <gdk/gdk.h>
#include <gtk/gtktogglebutton.h>
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 0098b79b61..b6f2e9adfe 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -32,7 +32,6 @@
#define __GTK_CHECK_MENU_ITEM_H__
-#include <gdk/gdk.h>
#include <gtk/gtkmenuitem.h>
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index bca7401c85..e167c530ec 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -30,7 +30,7 @@
#ifndef __GTK_CLIST_H__
#define __GTK_CLIST_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtksignal.h>
#include <gtk/gtkalignment.h>
#include <gtk/gtklabel.h>
@@ -39,6 +39,7 @@
#include <gtk/gtkvscrollbar.h>
#include <gtk/gtkenums.h>
+
G_BEGIN_DECLS
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index f56dbe89b2..0e88f1a4ed 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -32,7 +32,6 @@
#define __GTK_CONTAINER_H__
-#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkadjustment.h>
diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h
index d97b4f5bb2..5edd59db0a 100644
--- a/gtk/gtkcurve.h
+++ b/gtk/gtkcurve.h
@@ -42,9 +42,9 @@
#define __GTK_CURVE_H__
-#include <gdk/gdk.h>
#include <gtk/gtkdrawingarea.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_CURVE (gtk_curve_get_type ())
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 5cc1841b87..69d2c0049f 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -32,7 +32,6 @@
#define __GTK_DIALOG_H__
-#include <gdk/gdk.h>
#include <gtk/gtkwindow.h>
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 0fabdeca1d..0239168d61 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -32,11 +32,12 @@
#ifndef __GTK_DND_H__
#define __GTK_DND_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtkenums.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkselection.h>
+
G_BEGIN_DECLS
typedef enum {
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 2ad71fc5a0..3984940140 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -32,7 +32,6 @@
#define __GTK_DRAWING_AREA_H__
-#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index ec57b16be7..5dffd37aed 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -32,9 +32,9 @@
#define __GTK_EDITABLE_H__
-#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_EDITABLE (gtk_editable_get_type ())
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index ca9282831f..0f6ba3d984 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -32,13 +32,13 @@
#define __GTK_ENTRY_H__
-#include <gdk/gdk.h>
#include <gtk/gtkeditable.h>
#include <gtk/gtkimcontext.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkentrycompletion.h>
#include <pango/pango.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_ENTRY (gtk_entry_get_type ())
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index 78b63e394d..c8e9d9cd56 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@@ -32,7 +32,6 @@
#define __GTK_EVENT_BOX_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index 645a272e68..7c782473cd 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -32,7 +32,6 @@
#define __GTK_FIXED_H__
-#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index 07cba45eb6..d475dc6b96 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -36,10 +36,10 @@
#define __GTK_FONTSEL_H__
-#include <gdk/gdk.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkvbox.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ())
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index b9d3785ce6..2b1e926cde 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -32,7 +32,6 @@
#define __GTK_FRAME_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h
index 207732843e..bde3d88df4 100644
--- a/gtk/gtkgamma.h
+++ b/gtk/gtkgamma.h
@@ -42,7 +42,6 @@
#define __GTK_GAMMA_CURVE_H__
-#include <gdk/gdk.h>
#include <gtk/gtkvbox.h>
diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index 9ee0fccfd6..47fb39053d 100644
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -37,7 +37,6 @@
#define __GTK_HANDLE_BOX_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h
index 7e309a0a67..02b74acbe9 100644
--- a/gtk/gtkhbox.h
+++ b/gtk/gtkhbox.h
@@ -32,7 +32,6 @@
#define __GTK_HBOX_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbox.h>
diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h
index 1e167e1c9b..3c30917cef 100644
--- a/gtk/gtkhruler.h
+++ b/gtk/gtkhruler.h
@@ -42,7 +42,6 @@
#define __GTK_HRULER_H__
-#include <gdk/gdk.h>
#include <gtk/gtkruler.h>
diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h
index e1818bdab1..6b13a09c4c 100644
--- a/gtk/gtkhscale.h
+++ b/gtk/gtkhscale.h
@@ -32,7 +32,6 @@
#define __GTK_HSCALE_H__
-#include <gdk/gdk.h>
#include <gtk/gtkscale.h>
diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h
index f170a10f6d..f3300a7ccb 100644
--- a/gtk/gtkhscrollbar.h
+++ b/gtk/gtkhscrollbar.h
@@ -32,7 +32,6 @@
#define __GTK_HSCROLLBAR_H__
-#include <gdk/gdk.h>
#include <gtk/gtkscrollbar.h>
diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h
index 7ea9a545da..a4d9f11725 100644
--- a/gtk/gtkhseparator.h
+++ b/gtk/gtkhseparator.h
@@ -32,7 +32,6 @@
#define __GTK_HSEPARATOR_H__
-#include <gdk/gdk.h>
#include <gtk/gtkseparator.h>
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 42b0475a07..8c5e77b21b 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -32,7 +32,6 @@
#define __GTK_IMAGE_H__
-#include <gdk/gdk.h>
#include <gio/gio.h>
#include <gtk/gtkmisc.h>
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index 1b89900326..121042719c 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -32,9 +32,9 @@
#define __GTK_IMAGE_MENU_ITEM_H__
-#include <gdk/gdk.h>
#include <gtk/gtkmenuitem.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_IMAGE_MENU_ITEM (gtk_image_menu_item_get_type ())
diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h
index e9609d7d58..4c1647b992 100644
--- a/gtk/gtkinputdialog.h
+++ b/gtk/gtkinputdialog.h
@@ -42,7 +42,6 @@
#define __GTK_INPUTDIALOG_H__
-#include <gdk/gdk.h>
#include <gtk/gtkdialog.h>
diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h
index 9a6e407c97..4c3d3aee63 100644
--- a/gtk/gtkitem.h
+++ b/gtk/gtkitem.h
@@ -32,7 +32,6 @@
#define __GTK_ITEM_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 27e300dad9..59778ef67d 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -31,11 +31,11 @@
#define __GTK_LABEL_H__
-#include <gdk/gdk.h>
#include <gtk/gtkmisc.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkmenu.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_LABEL (gtk_label_get_type ())
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index d9743c63ef..0d2e6bcf54 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -35,10 +35,11 @@
#ifndef __GTK_LAYOUT_H__
#define __GTK_LAYOUT_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtkcontainer.h>
#include <gtk/gtkadjustment.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_LAYOUT (gtk_layout_get_type ())
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 3521e5ded3..6f988f0033 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -32,7 +32,6 @@
#define __GTK_MENU_H__
-#include <gdk/gdk.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkmenushell.h>
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index bb32d16745..2acce0b172 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -32,7 +32,6 @@
#define __GTK_MENU_BAR_H__
-#include <gdk/gdk.h>
#include <gtk/gtkmenushell.h>
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 8bd3c7f9e7..6c56409ad9 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -32,7 +32,6 @@
#define __GTK_MENU_ITEM_H__
-#include <gdk/gdk.h>
#include <gtk/gtkitem.h>
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index b38051e47a..e8281bcbb4 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -32,7 +32,6 @@
#define __GTK_MENU_SHELL_H__
-#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 6e34f9ec35..477c73b605 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -32,7 +32,6 @@
#define __GTK_MISC_H__
-#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
@@ -52,10 +51,10 @@ typedef struct _GtkMiscClass GtkMiscClass;
struct _GtkMisc
{
GtkWidget widget;
-
+
gfloat GSEAL (xalign);
gfloat GSEAL (yalign);
-
+
guint16 GSEAL (xpad);
guint16 GSEAL (ypad);
};
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 3e4ea32cc6..0659cc92d2 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -33,9 +33,9 @@
#define __GTK_NOTEBOOK_H__
-#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_NOTEBOOK (gtk_notebook_get_type ())
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index cb9040aff1..3ea9971960 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -31,7 +31,6 @@
#define __GTK_PLUG_H__
-#include <gdk/gdk.h>
#include <gtk/gtksocket.h>
#include <gtk/gtkwindow.h>
diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h
index b47e8760f1..0284add52f 100644
--- a/gtk/gtkprogress.h
+++ b/gtk/gtkprogress.h
@@ -21,14 +21,13 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_PROGRESS_H__
#define __GTK_PROGRESS_H__
-#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkadjustment.h>
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index a62b584ae9..6f09b2ce8a 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -32,7 +32,6 @@
#define __GTK_PROGRESS_BAR_H__
-#include <gdk/gdk.h>
#include <gtk/gtkprogress.h>
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 3e7abf81d4..c39e214db2 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -32,7 +32,6 @@
#define __GTK_RADIO_BUTTON_H__
-#include <gdk/gdk.h>
#include <gtk/gtkcheckbutton.h>
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index d7af6bbbfa..46daa4dc5c 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -32,9 +32,9 @@
#define __GTK_RADIO_MENU_ITEM_H__
-#include <gdk/gdk.h>
#include <gtk/gtkcheckmenuitem.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_RADIO_MENU_ITEM (gtk_radio_menu_item_get_type ())
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 5efa7547ab..7c6b46d011 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -32,7 +32,6 @@
#define __GTK_RANGE_H__
-#include <gdk/gdk.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index 308012a57c..50c0539cdc 100644
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -42,7 +42,6 @@
#define __GTK_RULER_H__
-#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index 3addba6eaf..3a86ee1ac6 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -32,7 +32,6 @@
#define __GTK_SCALE_H__
-#include <gdk/gdk.h>
#include <gtk/gtkrange.h>
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 72d859500f..b1d182e6a3 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -32,7 +32,6 @@
#define __GTK_SCROLLBAR_H__
-#include <gdk/gdk.h>
#include <gtk/gtkrange.h>
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index b36071ca95..a82b3b0967 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -32,7 +32,6 @@
#define __GTK_SCROLLED_WINDOW_H__
-#include <gdk/gdk.h>
#include <gtk/gtkhscrollbar.h>
#include <gtk/gtkvscrollbar.h>
#include <gtk/gtkviewport.h>
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index ac0f9d894e..2e41a96282 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -32,7 +32,6 @@
#define __GTK_SEPARATOR_H__
-#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index b8080ac5bf..8b9bb5920f 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.h
@@ -31,7 +31,7 @@
#ifndef __GTK_SEPARATOR_MENU_ITEM_H__
#define __GTK_SEPARATOR_MENU_ITEM_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtkmenuitem.h>
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index b513f9ae78..6767953792 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -35,7 +35,6 @@
#define __GTK_SPIN_BUTTON_H__
-#include <gdk/gdk.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkadjustment.h>
diff --git a/gtk/gtktable.h b/gtk/gtktable.h
index 39fe9b9967..9b3ebf9dd3 100644
--- a/gtk/gtktable.h
+++ b/gtk/gtktable.h
@@ -32,7 +32,6 @@
#define __GTK_TABLE_H__
-#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h
index 2a5b7fed10..a30b0ec462 100644
--- a/gtk/gtktearoffmenuitem.h
+++ b/gtk/gtktearoffmenuitem.h
@@ -32,9 +32,9 @@
#define __GTK_TEAROFF_MENU_ITEM_H__
-#include <gdk/gdk.h>
#include <gtk/gtkmenuitem.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_TEAROFF_MENU_ITEM (gtk_tearoff_menu_item_get_type ())
diff --git a/gtk/gtktext.h b/gtk/gtktext.h
index 32dc14a033..8bfa71aa21 100644
--- a/gtk/gtktext.h
+++ b/gtk/gtktext.h
@@ -30,10 +30,9 @@
#define __GTK_TEXT_H__
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
#include <gtk/gtkoldeditable.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_TEXT (gtk_text_get_type ())
diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h
index 0991f7d07c..49d3e511dc 100644
--- a/gtk/gtkthemes.h
+++ b/gtk/gtkthemes.h
@@ -2,7 +2,7 @@
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* Themes added by The Rasterman <raster@redhat.com>
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -22,16 +22,17 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_THEMES_H__
#define __GTK_THEMES_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtkstyle.h>
#include <gtk/gtkwidget.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_THEME_ENGINE (gtk_theme_engine_get_type ())
diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h
index 500ecf425b..b792d81219 100644
--- a/gtk/gtktipsquery.h
+++ b/gtk/gtktipsquery.h
@@ -32,6 +32,7 @@
#ifndef __GTK_TIPS_QUERY_H__
#define __GTK_TIPS_QUERY_H__
+
#include <gtk/gtk.h>
@@ -101,7 +102,7 @@ void gtk_tips_query_set_caller (GtkTipsQuery *tips_query,
void gtk_tips_query_set_labels (GtkTipsQuery *tips_query,
const gchar *label_inactive,
const gchar *label_no_tip);
-
+
G_END_DECLS
#endif /* __GTK_TIPS_QUERY_H__ */
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 009688a7b2..686dab8614 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -32,9 +32,9 @@
#define __GTK_TOGGLE_BUTTON_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbutton.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_TOGGLE_BUTTON (gtk_toggle_button_get_type ())
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 0c6b2b60dd..4de8ce1f90 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -36,7 +36,7 @@
#ifndef __GTK_TOOLBAR_H__
#define __GTK_TOOLBAR_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtkcontainer.h>
#include <gtk/gtkenums.h>
#include <gtk/gtktooltips.h>
diff --git a/gtk/gtktree.h b/gtk/gtktree.h
index d0b8089f1e..1d0e1f7343 100644
--- a/gtk/gtktree.h
+++ b/gtk/gtktree.h
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifdef GTK_ENABLE_BROKEN
@@ -29,15 +29,15 @@
#ifndef __GTK_TREE_H__
#define __GTK_TREE_H__
-/* set this flag to enable tree debugging output */
-/* #define TREE_DEBUG */
-#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
G_BEGIN_DECLS
+/* set this flag to enable tree debugging output */
+/* #define TREE_DEBUG */
+
#define GTK_TYPE_TREE (gtk_tree_get_type ())
#define GTK_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE, GtkTree))
#define GTK_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE, GtkTreeClass))
diff --git a/gtk/gtktreeitem.h b/gtk/gtktreeitem.h
index c7ba07a7f5..0e8dbaf1dd 100644
--- a/gtk/gtktreeitem.h
+++ b/gtk/gtktreeitem.h
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifdef GTK_ENABLE_BROKEN
@@ -30,7 +30,6 @@
#define __GTK_TREE_ITEM_H__
-#include <gdk/gdk.h>
#include <gtk/gtkitem.h>
diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h
index a0ca325b3c..68b549a743 100644
--- a/gtk/gtkvbox.h
+++ b/gtk/gtkvbox.h
@@ -32,7 +32,6 @@
#define __GTK_VBOX_H__
-#include <gdk/gdk.h>
#include <gtk/gtkbox.h>
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index cc496f4bea..a9300da5ba 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -32,7 +32,6 @@
#define __GTK_VIEWPORT_H__
-#include <gdk/gdk.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h
index 8126c32322..4cade7ba66 100644
--- a/gtk/gtkvruler.h
+++ b/gtk/gtkvruler.h
@@ -42,7 +42,6 @@
#define __GTK_VRULER_H__
-#include <gdk/gdk.h>
#include <gtk/gtkruler.h>
diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h
index ac9bf5f44f..8409912fa8 100644
--- a/gtk/gtkvscale.h
+++ b/gtk/gtkvscale.h
@@ -32,7 +32,6 @@
#define __GTK_VSCALE_H__
-#include <gdk/gdk.h>
#include <gtk/gtkscale.h>
diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h
index 184be409b1..2a8e85e8a0 100644
--- a/gtk/gtkvscrollbar.h
+++ b/gtk/gtkvscrollbar.h
@@ -32,7 +32,6 @@
#define __GTK_VSCROLLBAR_H__
-#include <gdk/gdk.h>
#include <gtk/gtkscrollbar.h>
diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h
index 8d57eef399..ee97ee0690 100644
--- a/gtk/gtkvseparator.h
+++ b/gtk/gtkvseparator.h
@@ -32,7 +32,6 @@
#define __GTK_VSEPARATOR_H__
-#include <gdk/gdk.h>
#include <gtk/gtkseparator.h>
diff --git a/gtk/gtkwin32embedwidget.h b/gtk/gtkwin32embedwidget.h
index 87d6d233e2..92515cfb82 100644
--- a/gtk/gtkwin32embedwidget.h
+++ b/gtk/gtkwin32embedwidget.h
@@ -20,16 +20,17 @@
* Modified by the GTK+ Team and others 1997-2006. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_WIN32_EMBED_WIDGET_H__
#define __GTK_WIN32_EMBED_WIDGET_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtkwindow.h>
#include "win32/gdkwin32.h"
+
G_BEGIN_DECLS
#define GTK_TYPE_WIN32_EMBED_WIDGET (gtk_win32_embed_widget_get_type ())
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 20829eca4e..dc1b5c59c3 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -31,11 +31,12 @@
#ifndef __GTK_WINDOW_H__
#define __GTK_WINDOW_H__
-#include <gdk/gdk.h>
+
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkbin.h>
#include <gtk/gtkenums.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_WINDOW (gtk_window_get_type ())