Commit e7b18d2a authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

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
parent 2c32cdd8
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
......
......@@ -32,7 +32,6 @@
#define __GTK_ALIGNMENT_H__
#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_ARROW_H__
#include <gdk/gdk.h>
#include <gtk/gtkmisc.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 ())
......
......@@ -32,7 +32,6 @@
#define __GTK_BIN_H__
#include <gdk/gdk.h>
#include <gtk/gtkcontainer.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_BOX_H__
#include <gdk/gdk.h>
#include <gtk/gtkcontainer.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>
......
......@@ -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 */
......
......@@ -32,7 +32,6 @@
#define __GTK_CHECK_BUTTON_H__
#include <gdk/gdk.h>
#include <gtk/gtktogglebutton.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_CHECK_MENU_ITEM_H__
#include <gdk/gdk.h>
#include <gtk/gtkmenuitem.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
......
......@@ -32,7 +32,6 @@
#define __GTK_CONTAINER_H__
#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkadjustment.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 ())
......
......@@ -32,7 +32,6 @@
#define __GTK_DIALOG_H__
#include <gdk/gdk.h>
#include <gtk/gtkwindow.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 {
......
......@@ -32,7 +32,6 @@
#define __GTK_DRAWING_AREA_H__
#include <gdk/gdk.h>
#include <gtk/gtkwidget.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 ())
......
......@@ -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 ())
......
......@@ -32,7 +32,6 @@
#define __GTK_EVENT_BOX_H__
#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_FIXED_H__
#include <gdk/gdk.h>
#include <gtk/gtkcontainer.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 ())
......
......@@ -32,7 +32,6 @@
#define __GTK_FRAME_H__
#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
......
......@@ -42,7 +42,6 @@
#define __GTK_GAMMA_CURVE_H__
#include <gdk/gdk.h>
#include <gtk/gtkvbox.h>
......
......@@ -37,7 +37,6 @@
#define __GTK_HANDLE_BOX_H__
#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_HBOX_H__
#include <gdk/gdk.h>
#include <gtk/gtkbox.h>
......
......@@ -42,7 +42,6 @@
#define __GTK_HRULER_H__
#include <gdk/gdk.h>
#include <gtk/gtkruler.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_HSCALE_H__
#include <gdk/gdk.h>
#include <gtk/gtkscale.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_HSCROLLBAR_H__
#include <gdk/gdk.h>
#include <gtk/gtkscrollbar.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_HSEPARATOR_H__
#include <gdk/gdk.h>
#include <gtk/gtkseparator.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_IMAGE_H__
#include <gdk/gdk.h>
#include <gio/gio.h>
#include <gtk/gtkmisc.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 ())
......
......@@ -42,7 +42,6 @@
#define __GTK_INPUTDIALOG_H__
#include <gdk/gdk.h>
#include <gtk/gtkdialog.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_ITEM_H__
#include <gdk/gdk.h>
#include <gtk/gtkbin.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 ())
......
......@@ -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 ())
......
......@@ -32,7 +32,6 @@
#define __GTK_MENU_H__
#include <gdk/gdk.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkmenushell.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_MENU_BAR_H__
#include <gdk/gdk.h>
#include <gtk/gtkmenushell.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_MENU_ITEM_H__
#include <gdk/gdk.h>
#include <gtk/gtkitem.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_MENU_SHELL_H__
#include <gdk/gdk.h>
#include <gtk/gtkcontainer.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);
};
......
......@@ -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 ())
......
......@@ -31,7 +31,6 @@
#define __GTK_PLUG_H__
#include <gdk/gdk.h>
#include <gtk/gtksocket.h>
#include <gtk/gtkwindow.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>
......
......@@ -32,7 +32,6 @@
#define __GTK_PROGRESS_BAR_H__
#include <gdk/gdk.h>
#include <gtk/gtkprogress.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_RADIO_BUTTON_H__
#include <gdk/gdk.h>
#include <gtk/gtkcheckbutton.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 ())
......
......@@ -32,7 +32,6 @@
#define __GTK_RANGE_H__
#include <gdk/gdk.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtkwidget.h>
......
......@@ -42,7 +42,6 @@
#define __GTK_RULER_H__
#include <gdk/gdk.h>
#include <gtk/gtkwidget.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_SCALE_H__
#include <gdk/gdk.h>
#include <gtk/gtkrange.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_SCROLLBAR_H__
#include <gdk/gdk.h>
#include <gtk/gtkrange.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>
......
......@@ -32,7 +32,6 @@
#define __GTK_SEPARATOR_H__
#include <gdk/gdk.h>
#include <gtk/gtkwidget.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>
......
......@@ -35,7 +35,6 @@
#define __GTK_SPIN_BUTTON_H__
#include <gdk/gdk.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkadjustment.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_TABLE_H__
#include <gdk/gdk.h>
#include <gtk/gtkcontainer.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 ())
......
......@@ -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 ())
......
......@@ -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 ())
......
......@@ -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__ */
......
......@@ -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 ())
......
......@@ -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>
......
......@@ -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))
......
......@@ -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>
......
......@@ -32,7 +32,6 @@
#define __GTK_VBOX_H__
#include <gdk/gdk.h>
#include <gtk/gtkbox.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_VIEWPORT_H__
#include <gdk/gdk.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtkbin.h>
......
......@@ -42,7 +42,6 @@
#define __GTK_VRULER_H__
#include <gdk/gdk.h>
#include <gtk/gtkruler.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_VSCALE_H__
#include <gdk/gdk.h>
#include <gtk/gtkscale.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_VSCROLLBAR_H__
#include <gdk/gdk.h>
#include <gtk/gtkscrollbar.h>
......
......@@ -32,7 +32,6 @@
#define __GTK_VSEPARATOR_H__
#include <gdk/gdk.h>
#include <gtk/gtkseparator.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 ())
......
......@@ -31,11 +31,12 @@
#ifndef __GTK_WINDOW_H__