summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2008-10-30 16:34:16 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-10-30 16:34:16 +0000
commit3544c281330337d75d7bc399a8c1ad8ed9a0350a (patch)
treebb7732e32f0f23989a569bc4503d514b596a515d
parenta3b07ac981ec10d286c98a8cbf39cb83d6763d2f (diff)
downloadgtk+-3544c281330337d75d7bc399a8c1ad8ed9a0350a.tar.gz
no need to include <gtk/gtkenums.h> in headers which somehow include
2008-10-30 Michael Natterer <mitch@imendio.com> * gtk/*.h: no need to include <gtk/gtkenums.h> in headers which somehow include gtkobject.h or another header which includes it. svn path=/trunk/; revision=21734
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtkbindings.h1
-rw-r--r--gtk/gtkbutton.h1
-rw-r--r--gtk/gtkclist.h1
-rw-r--r--gtk/gtkcontainer.h1
-rw-r--r--gtk/gtkdnd.h1
-rw-r--r--gtk/gtkobject.h1
-rw-r--r--gtk/gtkpagesetup.h3
-rw-r--r--gtk/gtkpapersize.h2
-rw-r--r--gtk/gtkprintcontext.h3
-rw-r--r--gtk/gtkprintoperation.h3
-rw-r--r--gtk/gtkprintutils.h2
-rw-r--r--gtk/gtkselection.h3
-rw-r--r--gtk/gtkstyle.h1
-rw-r--r--gtk/gtktexttag.h2
-rw-r--r--gtk/gtktoolbar.h1
-rw-r--r--gtk/gtktoolshell.h2
-rw-r--r--gtk/gtktreesortable.h3
-rw-r--r--gtk/gtkwindow.h1
19 files changed, 25 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 87d3ed3b54..e88fc63805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-30 Michael Natterer <mitch@imendio.com>
+
+ * gtk/*.h: no need to include <gtk/gtkenums.h> in headers which
+ somehow include gtkobject.h or another header which includes it.
+
2008-10-30 Marek Kasik <mkasik@redhat.com>
Bug 339714 - Set printer dpi on cairo ps/pdf surfaces when printing
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index f37a673a31..5e34feb321 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -37,7 +37,6 @@
#include <gdk/gdk.h>
#include <gtk/gtkobject.h>
-#include <gtk/gtkenums.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 8d2dd45425..1243e2abb5 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -33,7 +33,6 @@
#include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
#include <gtk/gtkimage.h>
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index e167c530ec..d97b5473ee 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -37,7 +37,6 @@
#include <gtk/gtkbutton.h>
#include <gtk/gtkhscrollbar.h>
#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkenums.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 0e88f1a4ed..0bf30b9a2f 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -32,7 +32,6 @@
#define __GTK_CONTAINER_H__
-#include <gtk/gtkenums.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkadjustment.h>
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 0239168d61..19af311411 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -33,7 +33,6 @@
#define __GTK_DND_H__
-#include <gtk/gtkenums.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkselection.h>
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index b7b9dcc226..de6616be2b 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -37,6 +37,7 @@
#include <gtk/gtktypeutils.h>
#include <gtk/gtkdebug.h>
+
G_BEGIN_DECLS
/* macros for casting a pointer to a GtkObject or GtkObjectClass pointer,
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index 635c7efb9b..d5eaea6d5d 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -25,9 +25,10 @@
#ifndef __GTK_PAGE_SETUP_H__
#define __GTK_PAGE_SETUP_H__
-#include <gtk/gtkenums.h>
+
#include <gtk/gtkpapersize.h>
+
G_BEGIN_DECLS
typedef struct _GtkPageSetup GtkPageSetup;
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index d7940e62d0..18302cae77 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -25,8 +25,10 @@
#ifndef __GTK_PAPER_SIZE_H__
#define __GTK_PAPER_SIZE_H__
+
#include <gtk/gtkenums.h>
+
G_BEGIN_DECLS
typedef struct _GtkPaperSize GtkPaperSize;
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index debeed6ae5..9bd13343cc 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -25,10 +25,11 @@
#ifndef __GTK_PRINT_CONTEXT_H__
#define __GTK_PRINT_CONTEXT_H__
+
#include <pango/pango.h>
-#include <gtk/gtkenums.h>
#include <gtk/gtkpagesetup.h>
+
G_BEGIN_DECLS
typedef struct _GtkPrintContext GtkPrintContext;
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 6e6565fc08..38c12d0318 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -25,15 +25,16 @@
#ifndef __GTK_PRINT_OPERATION_H__
#define __GTK_PRINT_OPERATION_H__
+
#include <cairo.h>
#include <gtk/gtkmain.h>
-#include <gtk/gtkenums.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkpagesetup.h>
#include <gtk/gtkprintsettings.h>
#include <gtk/gtkprintcontext.h>
#include <gtk/gtkprintoperationpreview.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_PRINT_OPERATION (gtk_print_operation_get_type ())
diff --git a/gtk/gtkprintutils.h b/gtk/gtkprintutils.h
index 765d1eb576..6c710021ed 100644
--- a/gtk/gtkprintutils.h
+++ b/gtk/gtkprintutils.h
@@ -20,8 +20,10 @@
#ifndef __GTK_PRINT_UTILS_H__
#define __GTK_PRINT_UTILS_H__
+
#include "gtkenums.h"
+
G_BEGIN_DECLS
#define MM_PER_INCH 25.4
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index 0106a9eb83..55bfcad89a 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -31,10 +31,11 @@
#ifndef __GTK_SELECTION_H__
#define __GTK_SELECTION_H__
-#include <gtk/gtkenums.h>
+
#include <gtk/gtkwidget.h>
#include <gtk/gtktextiter.h>
+
G_BEGIN_DECLS
typedef struct _GtkTargetList GtkTargetList;
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 781f2d59bd..48c4ce8e10 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -36,6 +36,7 @@
#include <gtk/gtkenums.h>
#include <pango/pango.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_STYLE (gtk_style_get_type ())
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index b1df01165e..394d355529 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -54,12 +54,14 @@
#ifndef __GTK_TEXT_TAG_H__
#define __GTK_TEXT_TAG_H__
+
#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
/* Not needed, retained for compatibility -Yosh */
#include <gtk/gtkobject.h>
+
G_BEGIN_DECLS
typedef struct _GtkTextIter GtkTextIter;
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 4de8ce1f90..f6bcc1ec8d 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -38,7 +38,6 @@
#include <gtk/gtkcontainer.h>
-#include <gtk/gtkenums.h>
#include <gtk/gtktooltips.h>
#include <gtk/gtktoolitem.h>
diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h
index fcd07aa5fa..be49304445 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -27,8 +27,10 @@
#ifndef __GTK_TOOL_SHELL_H__
#define __GTK_TOOL_SHELL_H__
+
#include <gtk/gtkenums.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_TOOL_SHELL (gtk_tool_shell_get_type ())
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index 17e7f940b8..a576e2dff0 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -24,10 +24,11 @@
#ifndef __GTK_TREE_SORTABLE_H__
#define __GTK_TREE_SORTABLE_H__
-#include <gtk/gtkenums.h>
+
#include <gtk/gtktreemodel.h>
#include <gtk/gtktypeutils.h>
+
G_BEGIN_DECLS
#define GTK_TYPE_TREE_SORTABLE (gtk_tree_sortable_get_type ())
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index dc1b5c59c3..e166befc89 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -34,7 +34,6 @@
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
G_BEGIN_DECLS
View Lorry Controller Status