Commit 2353d60b authored by Benjamin Otte's avatar Benjamin Otte

types: Move GtkAdustment declaration to gtktypes.h

... and make all the headers to not include gtkadjustment.h anymore. Of
course, also include it in the source files instead.
parent 7844e808
......@@ -21,6 +21,7 @@
#include <string.h>
#include "gtk/gtkadjustment.h"
#include "gtk/gtkiconviewprivate.h"
#include "gtk/gtkcellrendererpixbuf.h"
#include "gtk/gtkcellrenderertext.h"
......
......@@ -33,6 +33,7 @@
#include <string.h>
#include "gdk/gdk.h"
#include "gtkadjustment.h"
#include "gtkorientable.h"
#include "gtkhsv.h"
#include "gtkwindow.h"
......
......@@ -28,6 +28,8 @@
#include <stdlib.h>
#include "gtkhscale.h"
#include "gtkadjustment.h"
#include "gtkorientable.h"
......
......@@ -25,11 +25,12 @@
#include "config.h"
#include "gtkscrollbar.h"
#include "gtkhscrollbar.h"
#include "gtkorientable.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkorientable.h"
#include "gtkscrollbar.h"
/**
......
......@@ -28,6 +28,8 @@
#include <stdlib.h>
#include "gtkvscale.h"
#include "gtkadjustment.h"
#include "gtkorientable.h"
......
......@@ -25,11 +25,12 @@
#include "config.h"
#include "gtkorientable.h"
#include "gtkscrollbar.h"
#include "gtkvscrollbar.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkorientable.h"
#include "gtkscrollbar.h"
/**
......
......@@ -30,6 +30,7 @@
#define __GTK_ADJUSTMENT_H__
#include <gdk/gdk.h>
#include <gtk/gtktypes.h>
G_BEGIN_DECLS
......@@ -41,7 +42,6 @@ G_BEGIN_DECLS
#define GTK_ADJUSTMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
typedef struct _GtkAdjustment GtkAdjustment;
typedef struct _GtkAdjustmentPrivate GtkAdjustmentPrivate;
typedef struct _GtkAdjustmentClass GtkAdjustmentClass;
......
......@@ -22,6 +22,7 @@
#include "gtkcellrendererspin.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtkspinbutton.h"
......
......@@ -19,8 +19,9 @@
#include "gtkcolorplaneprivate.h"
#include "gtkcolorutils.h"
#include "gtkaccessible.h"
#include "gtkadjustment.h"
#include "gtkcolorutils.h"
#include "gtkintl.h"
struct _GtkColorPlanePrivate
......
......@@ -22,8 +22,8 @@
#ifndef __GTK_COLOR_PLANE_H__
#define __GTK_COLOR_PLANE_H__
#include <gtk/gtkadjustment.h>
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtktypes.h>
G_BEGIN_DECLS
......
......@@ -16,7 +16,10 @@
*/
#include "config.h"
#include "gtkcombobox.h"
#include "gtkadjustment.h"
#include "gtkcellareabox.h"
#include "gtktreemenu.h"
#include "gtkarrow.h"
......
......@@ -34,6 +34,7 @@
#include <gobject/gobjectnotifyqueue.c>
#include <gobject/gvaluecollector.h>
#include "gtkadjustment.h"
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtktypebuiltins.h"
......
......@@ -31,7 +31,6 @@
#include <gtk/gtkwidget.h>
#include <gtk/gtkadjustment.h>
G_BEGIN_DECLS
......
......@@ -24,29 +24,27 @@
#include <atk/atk.h>
#include "gtkfontchooserwidget.h"
#include "gtkfontchooser.h"
#include "gtkfontchooserutils.h"
#include "gtkadjustment.h"
#include "gtkbuildable.h"
#include "gtkbox.h"
#include "gtkcellrenderertext.h"
#include "gtkentry.h"
#include "gtkframe.h"
#include "gtkbbox.h"
#include "gtkbox.h"
#include "gtkgrid.h"
#include "gtkfontchooser.h"
#include "gtkfontchooserutils.h"
#include "gtkintl.h"
#include "gtklabel.h"
#include "gtkliststore.h"
#include "gtkstock.h"
#include "gtktextview.h"
#include "gtktreeselection.h"
#include "gtktreeview.h"
#include "gtkscrolledwindow.h"
#include "gtkintl.h"
#include "gtkaccessible.h"
#include "gtkbuildable.h"
#include "gtknotebook.h"
#include "gtkprivate.h"
#include "gtkscale.h"
#include "gtkscrolledwindow.h"
#include "gtkspinbutton.h"
#include "gtknotebook.h"
#include "gtktextview.h"
#include "gtktreeselection.h"
#include "gtktreeview.h"
#include "gtkwidget.h"
#include "gtkgrid.h"
/**
* SECTION:gtkfontchooserwidget
......
......@@ -22,6 +22,7 @@
#include "gtkiconview.h"
#include "gtkiconviewprivate.h"
#include "gtkadjustment.h"
#include "gtkcelllayout.h"
#include "gtkcellrenderer.h"
#include "gtkcellareabox.h"
......
......@@ -32,9 +32,10 @@
#include "gdk/gdk.h"
#include "gtkprivate.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkscrollable.h"
......
......@@ -35,7 +35,6 @@
#include <gtk/gtkcontainer.h>
#include <gtk/gtkadjustment.h>
G_BEGIN_DECLS
......
......@@ -95,6 +95,7 @@
#include "gtkaccellabel.h"
#include "gtkaccelmap.h"
#include "gtkadjustment.h"
#include "gtkbindings.h"
#include "gtkcheckmenuitem.h"
#include "gtkmain.h"
......
......@@ -28,18 +28,19 @@
#include <stdio.h>
#include <math.h>
#include "gtkrange.h"
#include "gtkadjustment.h"
#include "gtkcolorscaleprivate.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkorientableprivate.h"
#include "gtkrange.h"
#include "gtkprivate.h"
#include "gtkscale.h"
#include "gtkcolorscaleprivate.h"
#include "gtkscrollbar.h"
#include "gtkwindow.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtktypebuiltins.h"
#include "gtkwindow.h"
#include "a11y/gtkrangeaccessible.h"
/**
......
......@@ -30,7 +30,6 @@
#define __GTK_RANGE_H__
#include <gtk/gtkadjustment.h>
#include <gtk/gtkwidget.h>
......
......@@ -29,16 +29,18 @@
#include <stdlib.h>
#include "gtkscaleprivate.h"
#include "gtkadjustment.h"
#include "gtkbindings.h"
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkbindings.h"
#include "gtkorientable.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtktypebuiltins.h"
#include "a11y/gtkscaleaccessible.h"
......
......@@ -33,6 +33,8 @@
#include "config.h"
#include "gtkscalebutton.h"
#ifndef _WIN32
#define _GNU_SOURCE
#endif
......@@ -40,6 +42,7 @@
#include <stdlib.h>
#include <string.h>
#include "gtkadjustment.h"
#include "gtkbindings.h"
#include "gtkframe.h"
#include "gtkmain.h"
......@@ -47,7 +50,6 @@
#include "gtkorientable.h"
#include "gtkprivate.h"
#include "gtkscale.h"
#include "gtkscalebutton.h"
#include "gtkstock.h"
#include "gtkbox.h"
#include "gtkwindow.h"
......
......@@ -69,6 +69,8 @@
#include "config.h"
#include "gtkscrollable.h"
#include "gtkadjustment.h"
#include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h"
......
......@@ -22,8 +22,8 @@
#ifndef __GTK_SCROLLABLE_H__
#define __GTK_SCROLLABLE_H__
#include <gtk/gtkadjustment.h>
#include <gtk/gtkenums.h>
#include <gtk/gtktypes.h>
G_BEGIN_DECLS
......
......@@ -26,6 +26,8 @@
#include "config.h"
#include "gtkscrollbar.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkprivate.h"
......
......@@ -24,24 +24,25 @@
#include "config.h"
#include <math.h>
#include "gtkscrolledwindow.h"
#include "gtkadjustment.h"
#include "gtkbindings.h"
#include "gtkmarshalers.h"
#include "gtkscrollable.h"
#include "gtkscrollbar.h"
#include "gtkscrolledwindow.h"
#include "gtkwindow.h"
#include "gtkviewport.h"
#include "gtkdnd.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkscrollable.h"
#include "gtkscrollbar.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h"
#include "gtkviewport.h"
#include "gtkwidgetprivate.h"
#include "gtkwindow.h"
#include "a11y/gtkscrolledwindowaccessible.h"
#include <math.h>
/**
* SECTION:gtkscrolledwindow
* @Short_description: Adds scrollbars to its child widget
......
......@@ -27,14 +27,16 @@
#include "config.h"
#include "gtkspinbutton.h"
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <string.h>
#include <locale.h>
#include "gtkadjustment.h"
#include "gtkbindings.h"
#include "gtkspinbutton.h"
#include "gtkentryprivate.h"
#include "gtkicontheme.h"
#include "gtkmarshalers.h"
......
......@@ -34,7 +34,6 @@
#include <gtk/gtkentry.h>
#include <gtk/gtkadjustment.h>
G_BEGIN_DECLS
......
......@@ -22,6 +22,8 @@
#include <string.h>
#include "gtktreeview.h"
#include "gtkadjustment.h"
#include "gtkrbtree.h"
#include "gtktreednd.h"
#include "gtktreeprivate.h"
......
......@@ -31,6 +31,7 @@
G_BEGIN_DECLS
typedef struct _GtkAdjustment GtkAdjustment;
typedef struct _GtkClipboard GtkClipboard;
typedef struct _GtkIconSet GtkIconSet;
typedef struct _GtkIconSource GtkIconSource;
......
......@@ -26,11 +26,12 @@
#include "gtkviewport.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkscrollable.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h"
/**
......
......@@ -30,7 +30,6 @@
#define __GTK_VIEWPORT_H__
#include <gtk/gtkadjustment.h>
#include <gtk/gtkbin.h>
......
......@@ -28,9 +28,10 @@
#include "config.h"
#include "gtkvolumebutton.h"
#include "gtkstock.h"
#include "gtktooltip.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtktooltip.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