gtk+ r21732 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Thu Oct 30 15:58:06 2008
New Revision: 21732
URL: http://svn.gnome.org/viewvc/gtk+?rev=21732&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkalignment.h
   trunk/gtk/gtkarrow.h
   trunk/gtk/gtkaspectframe.h
   trunk/gtk/gtkbin.h
   trunk/gtk/gtkbox.h
   trunk/gtk/gtkbutton.h
   trunk/gtk/gtkcalendar.h
   trunk/gtk/gtkcheckbutton.h
   trunk/gtk/gtkcheckmenuitem.h
   trunk/gtk/gtkclist.h
   trunk/gtk/gtkcontainer.h
   trunk/gtk/gtkcurve.h
   trunk/gtk/gtkdialog.h
   trunk/gtk/gtkdnd.h
   trunk/gtk/gtkdrawingarea.h
   trunk/gtk/gtkeditable.h
   trunk/gtk/gtkentry.h
   trunk/gtk/gtkeventbox.h
   trunk/gtk/gtkfixed.h
   trunk/gtk/gtkfontsel.h
   trunk/gtk/gtkframe.h
   trunk/gtk/gtkgamma.h
   trunk/gtk/gtkhandlebox.h
   trunk/gtk/gtkhbox.h
   trunk/gtk/gtkhruler.h
   trunk/gtk/gtkhscale.h
   trunk/gtk/gtkhscrollbar.h
   trunk/gtk/gtkhseparator.h
   trunk/gtk/gtkimage.h
   trunk/gtk/gtkimagemenuitem.h
   trunk/gtk/gtkinputdialog.h
   trunk/gtk/gtkitem.h
   trunk/gtk/gtklabel.h
   trunk/gtk/gtklayout.h
   trunk/gtk/gtkmenu.h
   trunk/gtk/gtkmenubar.h
   trunk/gtk/gtkmenuitem.h
   trunk/gtk/gtkmenushell.h
   trunk/gtk/gtkmisc.h
   trunk/gtk/gtknotebook.h
   trunk/gtk/gtkplug.h
   trunk/gtk/gtkprogress.h
   trunk/gtk/gtkprogressbar.h
   trunk/gtk/gtkradiobutton.h
   trunk/gtk/gtkradiomenuitem.h
   trunk/gtk/gtkrange.h
   trunk/gtk/gtkruler.h
   trunk/gtk/gtkscale.h
   trunk/gtk/gtkscrollbar.h
   trunk/gtk/gtkscrolledwindow.h
   trunk/gtk/gtkseparator.h
   trunk/gtk/gtkseparatormenuitem.h
   trunk/gtk/gtkspinbutton.h
   trunk/gtk/gtktable.h
   trunk/gtk/gtktearoffmenuitem.h
   trunk/gtk/gtktext.h
   trunk/gtk/gtkthemes.h
   trunk/gtk/gtktipsquery.h
   trunk/gtk/gtktogglebutton.h
   trunk/gtk/gtktoolbar.h
   trunk/gtk/gtktree.h
   trunk/gtk/gtktreeitem.h
   trunk/gtk/gtkvbox.h
   trunk/gtk/gtkviewport.h
   trunk/gtk/gtkvruler.h
   trunk/gtk/gtkvscale.h
   trunk/gtk/gtkvscrollbar.h
   trunk/gtk/gtkvseparator.h
   trunk/gtk/gtkwin32embedwidget.h
   trunk/gtk/gtkwindow.h

Modified: trunk/gtk/gtkalignment.h
==============================================================================
--- trunk/gtk/gtkalignment.h	(original)
+++ trunk/gtk/gtkalignment.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_ALIGNMENT_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 
 

Modified: trunk/gtk/gtkarrow.h
==============================================================================
--- trunk/gtk/gtkarrow.h	(original)
+++ trunk/gtk/gtkarrow.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_ARROW_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkmisc.h>
 
 

Modified: trunk/gtk/gtkaspectframe.h
==============================================================================
--- trunk/gtk/gtkaspectframe.h	(original)
+++ trunk/gtk/gtkaspectframe.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkbin.h
==============================================================================
--- trunk/gtk/gtkbin.h	(original)
+++ trunk/gtk/gtkbin.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_BIN_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 
 

Modified: trunk/gtk/gtkbox.h
==============================================================================
--- trunk/gtk/gtkbox.h	(original)
+++ trunk/gtk/gtkbox.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_BOX_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 
 

Modified: trunk/gtk/gtkbutton.h
==============================================================================
--- trunk/gtk/gtkbutton.h	(original)
+++ trunk/gtk/gtkbutton.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_BUTTON_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkimage.h>

Modified: trunk/gtk/gtkcalendar.h
==============================================================================
--- trunk/gtk/gtkcalendar.h	(original)
+++ trunk/gtk/gtkcalendar.h	Thu Oct 30 15:58:06 2008
@@ -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 */

Modified: trunk/gtk/gtkcheckbutton.h
==============================================================================
--- trunk/gtk/gtkcheckbutton.h	(original)
+++ trunk/gtk/gtkcheckbutton.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_CHECK_BUTTON_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtktogglebutton.h>
 
 

Modified: trunk/gtk/gtkcheckmenuitem.h
==============================================================================
--- trunk/gtk/gtkcheckmenuitem.h	(original)
+++ trunk/gtk/gtkcheckmenuitem.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_CHECK_MENU_ITEM_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkmenuitem.h>
 
 

Modified: trunk/gtk/gtkclist.h
==============================================================================
--- trunk/gtk/gtkclist.h	(original)
+++ trunk/gtk/gtkclist.h	Thu Oct 30 15:58:06 2008
@@ -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
 
 

Modified: trunk/gtk/gtkcontainer.h
==============================================================================
--- trunk/gtk/gtkcontainer.h	(original)
+++ trunk/gtk/gtkcontainer.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_CONTAINER_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkadjustment.h>

Modified: trunk/gtk/gtkcurve.h
==============================================================================
--- trunk/gtk/gtkcurve.h	(original)
+++ trunk/gtk/gtkcurve.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkdialog.h
==============================================================================
--- trunk/gtk/gtkdialog.h	(original)
+++ trunk/gtk/gtkdialog.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_DIALOG_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkwindow.h>
 
 

Modified: trunk/gtk/gtkdnd.h
==============================================================================
--- trunk/gtk/gtkdnd.h	(original)
+++ trunk/gtk/gtkdnd.h	Thu Oct 30 15:58:06 2008
@@ -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 {

Modified: trunk/gtk/gtkdrawingarea.h
==============================================================================
--- trunk/gtk/gtkdrawingarea.h	(original)
+++ trunk/gtk/gtkdrawingarea.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_DRAWING_AREA_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 
 

Modified: trunk/gtk/gtkeditable.h
==============================================================================
--- trunk/gtk/gtkeditable.h	(original)
+++ trunk/gtk/gtkeditable.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkentry.h
==============================================================================
--- trunk/gtk/gtkentry.h	(original)
+++ trunk/gtk/gtkentry.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkeventbox.h
==============================================================================
--- trunk/gtk/gtkeventbox.h	(original)
+++ trunk/gtk/gtkeventbox.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_EVENT_BOX_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 
 

Modified: trunk/gtk/gtkfixed.h
==============================================================================
--- trunk/gtk/gtkfixed.h	(original)
+++ trunk/gtk/gtkfixed.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_FIXED_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 
 

Modified: trunk/gtk/gtkfontsel.h
==============================================================================
--- trunk/gtk/gtkfontsel.h	(original)
+++ trunk/gtk/gtkfontsel.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkframe.h
==============================================================================
--- trunk/gtk/gtkframe.h	(original)
+++ trunk/gtk/gtkframe.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_FRAME_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 
 

Modified: trunk/gtk/gtkgamma.h
==============================================================================
--- trunk/gtk/gtkgamma.h	(original)
+++ trunk/gtk/gtkgamma.h	Thu Oct 30 15:58:06 2008
@@ -42,7 +42,6 @@
 #define __GTK_GAMMA_CURVE_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkvbox.h>
 
 

Modified: trunk/gtk/gtkhandlebox.h
==============================================================================
--- trunk/gtk/gtkhandlebox.h	(original)
+++ trunk/gtk/gtkhandlebox.h	Thu Oct 30 15:58:06 2008
@@ -37,7 +37,6 @@
 #define __GTK_HANDLE_BOX_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 
 

Modified: trunk/gtk/gtkhbox.h
==============================================================================
--- trunk/gtk/gtkhbox.h	(original)
+++ trunk/gtk/gtkhbox.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_HBOX_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbox.h>
 
 

Modified: trunk/gtk/gtkhruler.h
==============================================================================
--- trunk/gtk/gtkhruler.h	(original)
+++ trunk/gtk/gtkhruler.h	Thu Oct 30 15:58:06 2008
@@ -42,7 +42,6 @@
 #define __GTK_HRULER_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkruler.h>
 
 

Modified: trunk/gtk/gtkhscale.h
==============================================================================
--- trunk/gtk/gtkhscale.h	(original)
+++ trunk/gtk/gtkhscale.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_HSCALE_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkscale.h>
 
 

Modified: trunk/gtk/gtkhscrollbar.h
==============================================================================
--- trunk/gtk/gtkhscrollbar.h	(original)
+++ trunk/gtk/gtkhscrollbar.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_HSCROLLBAR_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkscrollbar.h>
 
 

Modified: trunk/gtk/gtkhseparator.h
==============================================================================
--- trunk/gtk/gtkhseparator.h	(original)
+++ trunk/gtk/gtkhseparator.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_HSEPARATOR_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkseparator.h>
 
 

Modified: trunk/gtk/gtkimage.h
==============================================================================
--- trunk/gtk/gtkimage.h	(original)
+++ trunk/gtk/gtkimage.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_IMAGE_H__
 
 
-#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <gtk/gtkmisc.h>
 

Modified: trunk/gtk/gtkimagemenuitem.h
==============================================================================
--- trunk/gtk/gtkimagemenuitem.h	(original)
+++ trunk/gtk/gtkimagemenuitem.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkinputdialog.h
==============================================================================
--- trunk/gtk/gtkinputdialog.h	(original)
+++ trunk/gtk/gtkinputdialog.h	Thu Oct 30 15:58:06 2008
@@ -42,7 +42,6 @@
 #define __GTK_INPUTDIALOG_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkdialog.h>
 
 

Modified: trunk/gtk/gtkitem.h
==============================================================================
--- trunk/gtk/gtkitem.h	(original)
+++ trunk/gtk/gtkitem.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_ITEM_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 
 

Modified: trunk/gtk/gtklabel.h
==============================================================================
--- trunk/gtk/gtklabel.h	(original)
+++ trunk/gtk/gtklabel.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtklayout.h
==============================================================================
--- trunk/gtk/gtklayout.h	(original)
+++ trunk/gtk/gtklayout.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkmenu.h
==============================================================================
--- trunk/gtk/gtkmenu.h	(original)
+++ trunk/gtk/gtkmenu.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_MENU_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkmenushell.h>
 

Modified: trunk/gtk/gtkmenubar.h
==============================================================================
--- trunk/gtk/gtkmenubar.h	(original)
+++ trunk/gtk/gtkmenubar.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_MENU_BAR_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkmenushell.h>
 
 

Modified: trunk/gtk/gtkmenuitem.h
==============================================================================
--- trunk/gtk/gtkmenuitem.h	(original)
+++ trunk/gtk/gtkmenuitem.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_MENU_ITEM_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkitem.h>
 
 

Modified: trunk/gtk/gtkmenushell.h
==============================================================================
--- trunk/gtk/gtkmenushell.h	(original)
+++ trunk/gtk/gtkmenushell.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_MENU_SHELL_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 
 

Modified: trunk/gtk/gtkmisc.h
==============================================================================
--- trunk/gtk/gtkmisc.h	(original)
+++ trunk/gtk/gtkmisc.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_MISC_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 
 
@@ -52,10 +51,10 @@
 struct _GtkMisc
 {
   GtkWidget widget;
-  
+
   gfloat GSEAL (xalign);
   gfloat GSEAL (yalign);
-  
+
   guint16 GSEAL (xpad);
   guint16 GSEAL (ypad);
 };

Modified: trunk/gtk/gtknotebook.h
==============================================================================
--- trunk/gtk/gtknotebook.h	(original)
+++ trunk/gtk/gtknotebook.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkplug.h
==============================================================================
--- trunk/gtk/gtkplug.h	(original)
+++ trunk/gtk/gtkplug.h	Thu Oct 30 15:58:06 2008
@@ -31,7 +31,6 @@
 #define __GTK_PLUG_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtksocket.h>
 #include <gtk/gtkwindow.h>
 

Modified: trunk/gtk/gtkprogress.h
==============================================================================
--- trunk/gtk/gtkprogress.h	(original)
+++ trunk/gtk/gtkprogress.h	Thu Oct 30 15:58:06 2008
@@ -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>
 

Modified: trunk/gtk/gtkprogressbar.h
==============================================================================
--- trunk/gtk/gtkprogressbar.h	(original)
+++ trunk/gtk/gtkprogressbar.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_PROGRESS_BAR_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkprogress.h>
 
 

Modified: trunk/gtk/gtkradiobutton.h
==============================================================================
--- trunk/gtk/gtkradiobutton.h	(original)
+++ trunk/gtk/gtkradiobutton.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_RADIO_BUTTON_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkcheckbutton.h>
 
 

Modified: trunk/gtk/gtkradiomenuitem.h
==============================================================================
--- trunk/gtk/gtkradiomenuitem.h	(original)
+++ trunk/gtk/gtkradiomenuitem.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkrange.h
==============================================================================
--- trunk/gtk/gtkrange.h	(original)
+++ trunk/gtk/gtkrange.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_RANGE_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkwidget.h>
 

Modified: trunk/gtk/gtkruler.h
==============================================================================
--- trunk/gtk/gtkruler.h	(original)
+++ trunk/gtk/gtkruler.h	Thu Oct 30 15:58:06 2008
@@ -42,7 +42,6 @@
 #define __GTK_RULER_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 
 

Modified: trunk/gtk/gtkscale.h
==============================================================================
--- trunk/gtk/gtkscale.h	(original)
+++ trunk/gtk/gtkscale.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_SCALE_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkrange.h>
 
 

Modified: trunk/gtk/gtkscrollbar.h
==============================================================================
--- trunk/gtk/gtkscrollbar.h	(original)
+++ trunk/gtk/gtkscrollbar.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_SCROLLBAR_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkrange.h>
 
 

Modified: trunk/gtk/gtkscrolledwindow.h
==============================================================================
--- trunk/gtk/gtkscrolledwindow.h	(original)
+++ trunk/gtk/gtkscrolledwindow.h	Thu Oct 30 15:58:06 2008
@@ -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>

Modified: trunk/gtk/gtkseparator.h
==============================================================================
--- trunk/gtk/gtkseparator.h	(original)
+++ trunk/gtk/gtkseparator.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_SEPARATOR_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 
 

Modified: trunk/gtk/gtkseparatormenuitem.h
==============================================================================
--- trunk/gtk/gtkseparatormenuitem.h	(original)
+++ trunk/gtk/gtkseparatormenuitem.h	Thu Oct 30 15:58:06 2008
@@ -31,7 +31,7 @@
 #ifndef __GTK_SEPARATOR_MENU_ITEM_H__
 #define __GTK_SEPARATOR_MENU_ITEM_H__
 
-#include <gdk/gdk.h>
+
 #include <gtk/gtkmenuitem.h>
 
 

Modified: trunk/gtk/gtkspinbutton.h
==============================================================================
--- trunk/gtk/gtkspinbutton.h	(original)
+++ trunk/gtk/gtkspinbutton.h	Thu Oct 30 15:58:06 2008
@@ -35,7 +35,6 @@
 #define __GTK_SPIN_BUTTON_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkadjustment.h>
 

Modified: trunk/gtk/gtktable.h
==============================================================================
--- trunk/gtk/gtktable.h	(original)
+++ trunk/gtk/gtktable.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_TABLE_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 
 

Modified: trunk/gtk/gtktearoffmenuitem.h
==============================================================================
--- trunk/gtk/gtktearoffmenuitem.h	(original)
+++ trunk/gtk/gtktearoffmenuitem.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtktext.h
==============================================================================
--- trunk/gtk/gtktext.h	(original)
+++ trunk/gtk/gtktext.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkthemes.h
==============================================================================
--- trunk/gtk/gtkthemes.h	(original)
+++ trunk/gtk/gtkthemes.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtktipsquery.h
==============================================================================
--- trunk/gtk/gtktipsquery.h	(original)
+++ trunk/gtk/gtktipsquery.h	Thu Oct 30 15:58:06 2008
@@ -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_labels 	(GtkTipsQuery   *tips_query,
 						 const gchar    *label_inactive,
 						 const gchar    *label_no_tip);
-     
+
 G_END_DECLS
 
 #endif	/* __GTK_TIPS_QUERY_H__ */

Modified: trunk/gtk/gtktogglebutton.h
==============================================================================
--- trunk/gtk/gtktogglebutton.h	(original)
+++ trunk/gtk/gtktogglebutton.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtktoolbar.h
==============================================================================
--- trunk/gtk/gtktoolbar.h	(original)
+++ trunk/gtk/gtktoolbar.h	Thu Oct 30 15:58:06 2008
@@ -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>

Modified: trunk/gtk/gtktree.h
==============================================================================
--- trunk/gtk/gtktree.h	(original)
+++ trunk/gtk/gtktree.h	Thu Oct 30 15:58:06 2008
@@ -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))

Modified: trunk/gtk/gtktreeitem.h
==============================================================================
--- trunk/gtk/gtktreeitem.h	(original)
+++ trunk/gtk/gtktreeitem.h	Thu Oct 30 15:58:06 2008
@@ -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>
 
 

Modified: trunk/gtk/gtkvbox.h
==============================================================================
--- trunk/gtk/gtkvbox.h	(original)
+++ trunk/gtk/gtkvbox.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_VBOX_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbox.h>
 
 

Modified: trunk/gtk/gtkviewport.h
==============================================================================
--- trunk/gtk/gtkviewport.h	(original)
+++ trunk/gtk/gtkviewport.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_VIEWPORT_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkbin.h>
 

Modified: trunk/gtk/gtkvruler.h
==============================================================================
--- trunk/gtk/gtkvruler.h	(original)
+++ trunk/gtk/gtkvruler.h	Thu Oct 30 15:58:06 2008
@@ -42,7 +42,6 @@
 #define __GTK_VRULER_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkruler.h>
 
 

Modified: trunk/gtk/gtkvscale.h
==============================================================================
--- trunk/gtk/gtkvscale.h	(original)
+++ trunk/gtk/gtkvscale.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_VSCALE_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkscale.h>
 
 

Modified: trunk/gtk/gtkvscrollbar.h
==============================================================================
--- trunk/gtk/gtkvscrollbar.h	(original)
+++ trunk/gtk/gtkvscrollbar.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_VSCROLLBAR_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkscrollbar.h>
 
 

Modified: trunk/gtk/gtkvseparator.h
==============================================================================
--- trunk/gtk/gtkvseparator.h	(original)
+++ trunk/gtk/gtkvseparator.h	Thu Oct 30 15:58:06 2008
@@ -32,7 +32,6 @@
 #define __GTK_VSEPARATOR_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkseparator.h>
 
 

Modified: trunk/gtk/gtkwin32embedwidget.h
==============================================================================
--- trunk/gtk/gtkwin32embedwidget.h	(original)
+++ trunk/gtk/gtkwin32embedwidget.h	Thu Oct 30 15:58:06 2008
@@ -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 ())

Modified: trunk/gtk/gtkwindow.h
==============================================================================
--- trunk/gtk/gtkwindow.h	(original)
+++ trunk/gtk/gtkwindow.h	Thu Oct 30 15:58:06 2008
@@ -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 ())