gtk+ r21735 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Thu Oct 30 18:38:06 2008
New Revision: 21735
URL: http://svn.gnome.org/viewvc/gtk+?rev=21735&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkcellrenderertext.h
   trunk/gtk/gtkentry.c
   trunk/gtk/gtkentry.h
   trunk/gtk/gtkimcontext.h
   trunk/gtk/gtklabel.c
   trunk/gtk/gtkstyle.h

Modified: trunk/gtk/gtkcellrenderertext.h
==============================================================================
--- trunk/gtk/gtkcellrenderertext.h	(original)
+++ trunk/gtk/gtkcellrenderertext.h	Thu Oct 30 18:38:06 2008
@@ -24,7 +24,7 @@
 #ifndef __GTK_CELL_RENDERER_TEXT_H__
 #define __GTK_CELL_RENDERER_TEXT_H__
 
-#include <pango/pango.h>
+
 #include <gtk/gtkcellrenderer.h>
 
 

Modified: trunk/gtk/gtkentry.c
==============================================================================
--- trunk/gtk/gtkentry.c	(original)
+++ trunk/gtk/gtkentry.c	Thu Oct 30 18:38:06 2008
@@ -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"

Modified: trunk/gtk/gtkentry.h
==============================================================================
--- trunk/gtk/gtkentry.h	(original)
+++ trunk/gtk/gtkentry.h	Thu Oct 30 18:38:06 2008
@@ -36,7 +36,6 @@
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkentrycompletion.h>
-#include <pango/pango.h>
 
 
 G_BEGIN_DECLS

Modified: trunk/gtk/gtkimcontext.h
==============================================================================
--- trunk/gtk/gtkimcontext.h	(original)
+++ trunk/gtk/gtkimcontext.h	Thu Oct 30 18:38:06 2008
@@ -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
 

Modified: trunk/gtk/gtklabel.c
==============================================================================
--- trunk/gtk/gtklabel.c	(original)
+++ trunk/gtk/gtklabel.c	Thu Oct 30 18:38:06 2008
@@ -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"

Modified: trunk/gtk/gtkstyle.h
==============================================================================
--- trunk/gtk/gtkstyle.h	(original)
+++ trunk/gtk/gtkstyle.h	Thu Oct 30 18:38:06 2008
@@ -34,7 +34,6 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
-#include <pango/pango.h>
 
 
 G_BEGIN_DECLS