diff options
| author | Michael Natterer <mitch@gimp.org> | 2008-10-30 18:38:06 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-10-30 18:38:06 +0000 |
| commit | 7c0e3091fed4865daef6512728729b15160a969a (patch) | |
| tree | 9d12abe65f01ee253909c2e0d978846ee9259f6b | |
| parent | 3544c281330337d75d7bc399a8c1ad8ed9a0350a (diff) | |
| download | gtk+-7c0e3091fed4865daef6512728729b15160a969a.tar.gz | |
gtk/gtkcellrenderertext.h gtk/gtkentry.[ch] gtk/gtkimcontext.h
2008-10-30 Michael Natterer <mitch@gimp.org>
* gtk/gtkcellrenderertext.h
* gtk/gtkentry.[ch]
* gtk/gtkimcontext.h
* gtk/gtklabel.c
* gtk/gtkstyle.h: <pango/pango.h> is pulled in by <gdk/gdk.h>,
remove its inclusion here.
svn path=/trunk/; revision=21735
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gtk/gtkcellrenderertext.h | 2 | ||||
| -rw-r--r-- | gtk/gtkentry.c | 4 | ||||
| -rw-r--r-- | gtk/gtkentry.h | 1 | ||||
| -rw-r--r-- | gtk/gtkimcontext.h | 3 | ||||
| -rw-r--r-- | gtk/gtklabel.c | 5 | ||||
| -rw-r--r-- | gtk/gtkstyle.h | 1 |
7 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2008-10-30 Michael Natterer <mitch@gimp.org> + + * gtk/gtkcellrenderertext.h + * gtk/gtkentry.[ch] + * gtk/gtkimcontext.h + * gtk/gtklabel.c + * gtk/gtkstyle.h: <pango/pango.h> is pulled in by <gdk/gdk.h>, + remove its inclusion here. + 2008-10-30 Michael Natterer <mitch@imendio.com> * gtk/*.h: no need to include <gtk/gtkenums.h> in headers which diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h index 2875b272cb..fb96219e54 100644 --- a/gtk/gtkcellrenderertext.h +++ b/gtk/gtkcellrenderertext.h @@ -24,7 +24,7 @@ #ifndef __GTK_CELL_RENDERER_TEXT_H__ #define __GTK_CELL_RENDERER_TEXT_H__ -#include <pango/pango.h> + #include <gtk/gtkcellrenderer.h> diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 24d107a6dd..9aedc51061 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -22,14 +22,12 @@ * 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/. */ #include "config.h" #include <string.h> -#include <pango/pango.h> - #include "gdk/gdkkeysyms.h" #include "gtkalignment.h" #include "gtkbindings.h" diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index 0f6ba3d984..1416033859 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -36,7 +36,6 @@ #include <gtk/gtkimcontext.h> #include <gtk/gtkmenu.h> #include <gtk/gtkentrycompletion.h> -#include <pango/pango.h> G_BEGIN_DECLS diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h index b1f3575ad6..7e92f76ceb 100644 --- a/gtk/gtkimcontext.h +++ b/gtk/gtkimcontext.h @@ -24,9 +24,10 @@ #ifndef __GTK_IM_CONTEXT_H__ #define __GTK_IM_CONTEXT_H__ + #include <gdk/gdk.h> #include <gtk/gtkobject.h> -#include <pango/pango.h> + G_BEGIN_DECLS diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 833eb4a3bc..bce8a45c50 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -20,12 +20,14 @@ * 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/. */ #include "config.h" + #include <math.h> #include <string.h> + #include "gtklabel.h" #include "gtkaccellabel.h" #include "gtkdnd.h" @@ -34,7 +36,6 @@ #include "gtkwindow.h" #include "gdk/gdkkeysyms.h" #include "gtkclipboard.h" -#include <pango/pango.h> #include "gtkimagemenuitem.h" #include "gtkintl.h" #include "gtkseparatormenuitem.h" diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 48c4ce8e10..bef5c2bb83 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -34,7 +34,6 @@ #include <gdk/gdk.h> #include <gtk/gtkenums.h> -#include <pango/pango.h> G_BEGIN_DECLS |