Commit 7844e808 authored by Benjamin Otte's avatar Benjamin Otte

types: Clean up gtkwidget.h includes

In particular gtksettings.h and gtkstylecontext.h needed to be included
in lots of places now.

Also, I order the includes alphabetically in a bunch of headers.
parent 9e28aa92
......@@ -37,6 +37,7 @@
#include "gtkhsv.h"
#include "gtkbindings.h"
#include "gtkmarshalers.h"
#include "gtkstylecontext.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h"
......
......@@ -26,6 +26,7 @@
#include "gtkmenuprivate.h"
#include "gtkmenuitemprivate.h"
#include "gtkstylecontext.h"
#include "gtktearoffmenuitem.h"
#include "gtkintl.h"
......
......@@ -28,6 +28,7 @@
#include "gtkaccelgroup.h"
#include "gtkaccelmap.h"
#include "gtkintl.h"
#include "gtksettings.h"
#include <gdk/gdk.h>
#ifdef GDK_WINDOWING_X11
......
......@@ -66,6 +66,7 @@
#include "gtknotebook.h"
#include "gtkimage.h"
#include "gtklabel.h"
#include "gtksettings.h"
#include "gtksizegroup.h"
#include "gtksizerequest.h"
#include "gtkstock.h"
......
......@@ -31,6 +31,7 @@
#include "gtkbindingsprivate.h"
#include "gtkkeyhash.h"
#include "gtkstylecontext.h"
#include "gtkwidget.h"
#include "gtkintl.h"
......
......@@ -30,8 +30,9 @@
#include "gtkcellrendererspinner.h"
#include "gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h"
#include "gtksettings.h"
#include "gtktypebuiltins.h"
#undef GDK_DEPRECATED
#undef GDK_DEPRECATED_FOR
......
......@@ -39,6 +39,7 @@
#include "gtklabel.h"
#include "gtkspinbutton.h"
#include "gtkintl.h"
#include "gtkstylecontext.h"
#include <math.h>
......
......@@ -22,6 +22,7 @@
#ifndef __GTK_COLOR_PLANE_H__
#define __GTK_COLOR_PLANE_H__
#include <gtk/gtkadjustment.h>
#include <gtk/gtkdrawingarea.h>
G_BEGIN_DECLS
......
......@@ -39,6 +39,7 @@
#include "gtkbindings.h"
#include "gtkprivate.h"
#include "gtkbuildable.h"
#include "gtksettings.h"
/**
* SECTION:gtkdialog
......
......@@ -25,6 +25,7 @@
#include "config.h"
#include "gtkdrawingarea.h"
#include "gtkintl.h"
#include "gtkstylecontext.h"
/**
......
......@@ -54,6 +54,7 @@
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtksettings.h"
/**
......
......@@ -39,7 +39,7 @@
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
#include "gtkframe.h"
#include "gtkpaned.h"
#include "gtkgrid.h"
#include "gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkimage.h"
......@@ -49,6 +49,7 @@
#include "gtkmarshalers.h"
#include "gtkmessagedialog.h"
#include "gtkmountoperation.h"
#include "gtkpaned.h"
#include "gtkpathbar.h"
#include "gtkprivate.h"
#include "gtkradiobutton.h"
......@@ -56,10 +57,10 @@
#include "gtkrecentmanager.h"
#include "gtkscrolledwindow.h"
#include "gtkseparatormenuitem.h"
#include "gtksettings.h"
#include "gtksizegroup.h"
#include "gtksizerequest.h"
#include "gtkstock.h"
#include "gtkgrid.h"
#include "gtktoolbar.h"
#include "gtktoolbutton.h"
#include "gtktooltip.h"
......
......@@ -30,9 +30,8 @@
#define __GTK_ICON_FACTORY_H__
#include <gdk/gdk.h>
#include <gtk/gtksettings.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkwidgetpath.h>
#include <gtk/gtktypes.h>
G_BEGIN_DECLS
......@@ -50,12 +49,6 @@ typedef struct _GtkIconFactory GtkIconFactory;
typedef struct _GtkIconFactoryPrivate GtkIconFactoryPrivate;
typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
typedef struct _GtkIconSet GtkIconSet;
typedef struct _GtkIconSource GtkIconSource;
typedef struct _GtkStyle GtkStyle;
typedef struct _GtkRcStyle GtkRcStyle;
struct _GtkIconFactory
{
GObject parent_instance;
......
......@@ -22,12 +22,13 @@
#include "gtkimmulticontext.h"
#include "gtkimmoduleprivate.h"
#include "gtkintl.h"
#include "gtklabel.h"
#include "gtkmain.h"
#include "gtkprivate.h"
#include "gtkradiomenuitem.h"
#include "gtkseparatormenuitem.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtksettings.h"
/**
......
......@@ -40,6 +40,7 @@
#include "gtkactivatable.h"
#include "gtkwidgetprivate.h"
#include "gtkintl.h"
#include "gtksettings.h"
#include "gtktypebuiltins.h"
#include "a11y/gtkmenuitemaccessible.h"
......
......@@ -22,17 +22,18 @@
#include <string.h>
#include "gtktogglebutton.h"
#include "gtkarrow.h"
#include "gtkbox.h"
#include "gtkdnd.h"
#include "gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkimage.h"
#include "gtkintl.h"
#include "gtkicontheme.h"
#include "gtkiconfactory.h"
#include "gtklabel.h"
#include "gtkbox.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtksettings.h"
#include "gtktogglebutton.h"
enum {
......
......@@ -23,8 +23,11 @@
*/
#include "config.h"
#include "gtkseparatormenuitem.h"
#include "gtkstylecontext.h"
/**
* SECTION:gtkseparatormenuitem
* @Short_description: A separator used in menus
......
......@@ -23,6 +23,7 @@
#define __GTK_SETTINGS_H__
#include <gdk/gdk.h>
#include <gtk/gtktypes.h>
G_BEGIN_DECLS
......@@ -37,17 +38,11 @@ G_BEGIN_DECLS
/* --- typedefs --- */
typedef struct _GtkSettings GtkSettings;
typedef struct _GtkSettingsPrivate GtkSettingsPrivate;
typedef struct _GtkSettingsClass GtkSettingsClass;
typedef struct _GtkSettingsValue GtkSettingsValue;
typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
const GString *rc_string,
GValue *property_value);
/* --- structures --- */
struct _GtkSettings
{
......
......@@ -29,10 +29,11 @@
#include "config.h"
#include "gtkintl.h"
#include "gtkaccessible.h"
#include "gtkimage.h"
#include "gtkspinner.h"
#include "gtkimage.h"
#include "gtkintl.h"
#include "gtkstylecontext.h"
#include "a11y/gtkspinneraccessible.h"
......
......@@ -36,6 +36,7 @@
#include "gtkiconfactory.h"
#include "gtkwidgetprivate.h"
#include "gtkstyleproviderprivate.h"
#include "gtksettings.h"
/**
* SECTION:gtkstylecontext
......
......@@ -22,11 +22,10 @@
#ifndef __GTK_STYLE_CONTEXT_H__
#define __GTK_STYLE_CONTEXT_H__
#include <glib-object.h>
#include <gtk/gtkborder.h>
#include <gtk/gtkcsssection.h>
#include <gtk/gtkstyleprovider.h>
#include <gtk/gtkwidgetpath.h>
#include <gtk/gtkborder.h>
#include <gtk/gtktypes.h>
#include <atk/atk.h>
G_BEGIN_DECLS
......@@ -38,7 +37,6 @@ G_BEGIN_DECLS
#define GTK_IS_STYLE_CONTEXT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GTK_TYPE_STYLE_CONTEXT))
#define GTK_STYLE_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_STYLE_CONTEXT, GtkStyleContextClass))
typedef struct _GtkStyleContext GtkStyleContext;
typedef struct _GtkStyleContextClass GtkStyleContextClass;
typedef struct _GtkStyleContextPrivate GtkStyleContextPrivate;
......
......@@ -30,7 +30,9 @@
#include "gtklabel.h"
#include "gtkimage.h"
#include "gtkbox.h"
#include "gtksettings.h"
#include "gtksizerequest.h"
#include "gtkstylecontext.h"
#include "gtkwindowprivate.h"
......
......@@ -48,6 +48,7 @@
#include "gtkstylecontextprivate.h"
#include "gtktypebuiltins.h"
#include "gtkmain.h"
#include "gtksettings.h"
#include "a11y/gtktreeviewaccessible.h"
......
......@@ -29,18 +29,27 @@
#ifndef __GTK_TYPES_H__
#define __GTK_TYPES_H__
#include <gdk/gdk.h>
G_BEGIN_DECLS
typedef struct _GtkClipboard GtkClipboard;
typedef struct _GtkIconSet GtkIconSet;
typedef struct _GtkIconSource GtkIconSource;
typedef struct _GtkRcStyle GtkRcStyle;
typedef struct _GtkRequisition GtkRequisition;
typedef struct _GtkSelectionData GtkSelectionData;
typedef struct _GtkSettings GtkSettings;
typedef struct _GtkStyle GtkStyle;
typedef struct _GtkStyleContext GtkStyleContext;
typedef struct _GtkTooltip GtkTooltip;
typedef struct _GtkWidget GtkWidget;
typedef struct _GtkWidgetPath GtkWidgetPath;
typedef struct _GtkWindow GtkWindow;
typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
const GString *rc_string,
GValue *property_value);
G_END_DECLS
#endif /* __GTK_TYPES_H__ */
......@@ -31,10 +31,7 @@
#include <gdk/gdk.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkadjustment.h>
#include <gtk/gtkborder.h>
#include <gtk/gtksettings.h>
#include <gtk/gtkstylecontext.h>
#include <gtk/gtktypes.h>
#include <atk/atk.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment