libgnomecanvas r1331 - in trunk: . libgnomecanvas

[cosimoc svn gnome org]

Author: cosimoc
Date: Sat Oct 18 01:39:43 2008
New Revision: 1331
URL: http://svn.gnome.org/viewvc/libgnomecanvas?rev=1331&view=rev

Log:
2008-10-18  Cosimo Cecchi  <cosimoc gnome org>

	* configure.in:
	* libgnomecanvas/Makefile.am:
	* libgnomecanvas/gailcanvas.h:
	* libgnomecanvas/gnome-canvas-pixbuf.c:
	* libgnomecanvas/gnome-canvas-rich-text.c:
	* libgnomecanvas/gnome-canvas-rich-text.h:
	* libgnomecanvas/gnome-canvas.c:
	* libgnomecanvas/gnome-canvas.h:
	Use and enforce single GTK+ includes.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgnomecanvas/Makefile.am
   trunk/libgnomecanvas/gailcanvas.h
   trunk/libgnomecanvas/gnome-canvas-pixbuf.c
   trunk/libgnomecanvas/gnome-canvas-rich-text.c
   trunk/libgnomecanvas/gnome-canvas-rich-text.h
   trunk/libgnomecanvas/gnome-canvas.c
   trunk/libgnomecanvas/gnome-canvas.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Oct 18 01:39:43 2008
@@ -90,6 +90,11 @@
 PKG_PROG_PKG_CONFIG([0.18])
 PKG_CHECK_MODULES(LIBGNOMECANVAS, $CANVAS_MODULES)
 
+if test "$enable_maintainer_mode" = "yes"; then
+	LIBGNOMECANVAS_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+	AC_SUBST(LIBGNOMECANVAS_DEPRECATED_CFLAGS)
+fi
+
 PKG_CHECK_MODULES(CANVAS_GLADE, $CANVAS_MODULES libglade-2.0 >= libglade_required_version)
 
 AC_MSG_CHECKING([for native Win32])

Modified: trunk/libgnomecanvas/Makefile.am
==============================================================================
--- trunk/libgnomecanvas/Makefile.am	(original)
+++ trunk/libgnomecanvas/Makefile.am	Sat Oct 18 01:39:43 2008
@@ -7,6 +7,7 @@
 	-I$(top_builddir)				\
 	$(WARN_CFLAGS) 					\
 	$(LIBGNOMECANVAS_CFLAGS)			\
+	$(LIBGNOMECANVAS_DEPRECATED_CFLAGS)		\
         -DGNOMECANVASLIBDIR=\""$(libdir)"\" 		\
         -DGNOMECANVASDATADIR=\""$(datadir)"\" 		\
         -DGNOMECANVASPIXMAPDIR=\""$(datadir)/pixmaps"\"	\

Modified: trunk/libgnomecanvas/gailcanvas.h
==============================================================================
--- trunk/libgnomecanvas/gailcanvas.h	(original)
+++ trunk/libgnomecanvas/gailcanvas.h	Sat Oct 18 01:39:43 2008
@@ -21,7 +21,7 @@
 #ifndef __GAIL_CANVAS_H__
 #define __GAIL_CANVAS_H__
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 
 /* This code provides the ATK implementation for gnome-canvas widgets. */
 

Modified: trunk/libgnomecanvas/gnome-canvas-pixbuf.c
==============================================================================
--- trunk/libgnomecanvas/gnome-canvas-pixbuf.c	(original)
+++ trunk/libgnomecanvas/gnome-canvas-pixbuf.c	Sat Oct 18 01:39:43 2008
@@ -116,7 +116,7 @@
  *
  * Return value: The type ID of the #GnomeCanvasPixbuf class.
  **/
-GtkType
+GType
 gnome_canvas_pixbuf_get_type (void)
 {
 	static GType pixbuf_type;

Modified: trunk/libgnomecanvas/gnome-canvas-rich-text.c
==============================================================================
--- trunk/libgnomecanvas/gnome-canvas-rich-text.c	(original)
+++ trunk/libgnomecanvas/gnome-canvas-rich-text.c	Sat Oct 18 01:39:43 2008
@@ -26,9 +26,8 @@
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktextdisplay.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
+#include <gtk/gtktextlayout.h>
 
 #include "gnome-canvas.h"
 #include "gnome-canvas-util.h"

Modified: trunk/libgnomecanvas/gnome-canvas-rich-text.h
==============================================================================
--- trunk/libgnomecanvas/gnome-canvas-rich-text.h	(original)
+++ trunk/libgnomecanvas/gnome-canvas-rich-text.h	Sat Oct 18 01:39:43 2008
@@ -24,7 +24,7 @@
 #define GNOME_CANVAS_RICH_TEXT_H
 
 #include <libgnomecanvas/gnome-canvas.h>
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgnomecanvas/gnome-canvas.c
==============================================================================
--- trunk/libgnomecanvas/gnome-canvas.c	(original)
+++ trunk/libgnomecanvas/gnome-canvas.c	Sat Oct 18 01:39:43 2008
@@ -79,8 +79,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <gdk/gdkprivate.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include "gailcanvas.h"
 #include "gnome-canvas.h"
 #include "gnome-canvas-i18n.h"

Modified: trunk/libgnomecanvas/gnome-canvas.h
==============================================================================
--- trunk/libgnomecanvas/gnome-canvas.h	(original)
+++ trunk/libgnomecanvas/gnome-canvas.h	Sat Oct 18 01:39:43 2008
@@ -37,7 +37,7 @@
 #ifndef GNOME_CANVAS_H
 #define GNOME_CANVAS_H
 
-#include <gtk/gtklayout.h>
+#include <gtk/gtk.h>
 #include <stdarg.h>
 #include <libart_lgpl/art_misc.h>
 #include <libart_lgpl/art_rect.h>