atk r1246 - in trunk: . atk

From: mitch svn gnome org
To: svn-commits-list gnome org
Subject: atk r1246 - in trunk: . atk
Date: Thu, 5 Jun 2008 09:03:47 +0000 (UTC)
Author: mitch
Date: Thu Jun  5 09:03:47 2008
New Revision: 1246
URL: http://svn.gnome.org/viewvc/atk?rev=1246&view=rev

Log:
2008-06-05  Michael Natterer  <mitch imendio com>

	* configure.in: add G_DISABLE_SINGLE_INCLUDES and
	ATK_DISABLE_SINGLE_INCLUDES to CPPFLAGS.

	* atk/atk.h: define __ATK_H_INSIDE__ around including all other
	headers.

	* atk/atk*.h: add single-include guards that #error out if
	ATK_DISABLE_SINGLE_INCLUDES is defined and any of these files is
	included individually. Use G_BEGIN_DECLS/G_END_DECLS in all files.

	* atk/Makefile.am: define ATK_COMPILATION while building ATK.
	Add single-include guards to the generated atk-enum-types.h too.



Modified:
   trunk/ChangeLog
   trunk/atk/Makefile.am
   trunk/atk/atk.h
   trunk/atk/atkaction.h
   trunk/atk/atkcomponent.h
   trunk/atk/atkdocument.h
   trunk/atk/atkeditabletext.h
   trunk/atk/atkgobjectaccessible.h
   trunk/atk/atkhyperlink.h
   trunk/atk/atkhyperlinkimpl.h
   trunk/atk/atkhypertext.h
   trunk/atk/atkimage.h
   trunk/atk/atkmisc.h
   trunk/atk/atknoopobject.h
   trunk/atk/atknoopobjectfactory.h
   trunk/atk/atkobject.h
   trunk/atk/atkobjectfactory.h
   trunk/atk/atkregistry.h
   trunk/atk/atkrelation.h
   trunk/atk/atkrelationset.h
   trunk/atk/atkrelationtype.h
   trunk/atk/atkselection.h
   trunk/atk/atkstate.h
   trunk/atk/atkstateset.h
   trunk/atk/atkstreamablecontent.h
   trunk/atk/atktable.h
   trunk/atk/atktext.h
   trunk/atk/atkutil.h
   trunk/atk/atkvalue.h
   trunk/configure.in

Modified: trunk/atk/Makefile.am
==============================================================================
--- trunk/atk/Makefile.am	(original)
+++ trunk/atk/Makefile.am	Thu Jun  5 09:03:47 2008
@@ -11,6 +11,7 @@
 INCLUDES = \
 	-I$(top_srcdir)		\
 	-DG_DISABLE_DEPRECATED	\
+	-DATK_COMPILATION	\
 	-DATK_LOCALEDIR="\"$(datadir)/locale\""	\
 	$(DEP_CFLAGS)
 
@@ -109,7 +110,7 @@
 	@true
 s-enum-types-h: @REBUILD@ $(atk_headers) Makefile
 	( cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+			--fhead "#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)\n#error \"Only <atk/atk.h> can be included directly.\"\n#endif\n\n#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 			--fprod "/* enumerations from \"@filename \" */\n" \
 			--vhead "GType @enum_name _get_type (void);\n#define ATK_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n"         \
 			--ftail "G_END_DECLS\n\n#endif /* __ATK_ENUM_TYPES_H__ */" \

Modified: trunk/atk/atk.h
==============================================================================
--- trunk/atk/atk.h	(original)
+++ trunk/atk/atk.h	Thu Jun  5 09:03:47 2008
@@ -20,6 +20,8 @@
 #ifndef __ATK_H__
 #define __ATK_H__
 
+#define __ATK_H_INSIDE__
+
 #include <atk/atkobject.h>
 #include <atk/atkaction.h>
 #include <atk/atkcomponent.h>
@@ -47,4 +49,6 @@
 #include <atk/atkmisc.h>
 #include <atk/atkvalue.h>
 
+#undef __ATK_H_INSIDE__
+
 #endif /* __ATK_H__ */

Modified: trunk/atk/atkaction.h
==============================================================================
--- trunk/atk/atkaction.h	(original)
+++ trunk/atk/atkaction.h	Thu Jun  5 09:03:47 2008
@@ -17,14 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_ACTION_H__
 #define __ATK_ACTION_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The interface AtkAction should be supported by any object that can 
@@ -104,9 +106,6 @@
  *       (an accessible action, or the list of actions, has changed)
  */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_ACTION_H__ */

Modified: trunk/atk/atkcomponent.h
==============================================================================
--- trunk/atk/atkcomponent.h	(original)
+++ trunk/atk/atkcomponent.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_COMPONENT_H__
 #define __ATK_COMPONENT_H__
 
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The AtkComponent interface should be supported by any object that is 
@@ -163,9 +165,7 @@
                                                             gint            width,
                                                             gint            height);
 gdouble               atk_component_get_alpha              (AtkComponent    *component);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __ATK_COMPONENT_H__ */

Modified: trunk/atk/atkdocument.h
==============================================================================
--- trunk/atk/atkdocument.h	(original)
+++ trunk/atk/atkdocument.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_DOCUMENT_H__
 #define __ATK_DOCUMENT_H__
 
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The AtkDocument interface should be supported by any object that is a container
@@ -75,7 +77,7 @@
 gboolean              atk_document_set_attribute_value (AtkDocument *document,
                                                         const gchar *attribute_name,
                                                         const gchar *attribute_value);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
+
 #endif /* __ATK_DOCUMENT_H__ */

Modified: trunk/atk/atkeditabletext.h
==============================================================================
--- trunk/atk/atkeditabletext.h	(original)
+++ trunk/atk/atkeditabletext.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_EDITABLE_TEXT_H__
 #define __ATK_EDITABLE_TEXT_H__
 
 #include <atk/atkobject.h>
 #include <atk/atktext.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * AtkEditableText is used to support access in an "accessibility" context
@@ -96,10 +98,7 @@
                                              gint             end_pos);
 void atk_editable_text_paste_text           (AtkEditableText  *text,
                                              gint             position);
- 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __ATK_EDITABLE_TEXT_H__ */

Modified: trunk/atk/atkgobjectaccessible.h
==============================================================================
--- trunk/atk/atkgobjectaccessible.h	(original)
+++ trunk/atk/atkgobjectaccessible.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_GOBJECT_ACCESSIBLE_H__
 #define __ATK_GOBJECT_ACCESSIBLE_H__
 
 #include <atk/atk.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The AtkGObjectAccessible class is provided as a basis for implementing
@@ -59,9 +60,6 @@
 AtkObject *atk_gobject_accessible_for_object      (GObject           *obj);
 GObject   *atk_gobject_accessible_get_object      (AtkGObjectAccessible *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_GOBJECT_ACCESSIBLE_H__ */

Modified: trunk/atk/atkhyperlink.h
==============================================================================
--- trunk/atk/atkhyperlink.h	(original)
+++ trunk/atk/atkhyperlink.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_HYPERLINK_H__
 #define __ATK_HYPERLINK_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <atk/atkaction.h>
 
+G_BEGIN_DECLS
+
 /*
  * AtkHyperlink encapsulates a link or set of links in a hypertext document.
  *
@@ -97,10 +99,6 @@
 gint		 atk_hyperlink_get_n_anchors        (AtkHyperlink     *link_);
 gboolean         atk_hyperlink_is_selected_link     (AtkHyperlink     *link_);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_HYPERLINK_H__ */

Modified: trunk/atk/atkhyperlinkimpl.h
==============================================================================
--- trunk/atk/atkhyperlinkimpl.h	(original)
+++ trunk/atk/atkhyperlinkimpl.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_HYPERLINK_IMPL_H__
 #define __ATK_HYPERLINK_IMPL_H__
 
 #include <atk/atkobject.h>
 #include <atk/atkhyperlink.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The AtkHyperlinkImpl interface should be supported by objects
@@ -68,9 +70,6 @@
 
 AtkHyperlink    *atk_hyperlink_impl_get_hyperlink (AtkHyperlinkImpl *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_HYPERLINK_IMPL_H__ */

Modified: trunk/atk/atkhypertext.h
==============================================================================
--- trunk/atk/atkhypertext.h	(original)
+++ trunk/atk/atkhypertext.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_HYPERTEXT_H__
 #define __ATK_HYPERTEXT_H__
 
 #include <atk/atkobject.h>
 #include <atk/atkhyperlink.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The AtkHypertext interface provides standard  mechanisms for manipulating 
@@ -71,10 +73,6 @@
 gint          atk_hypertext_get_link_index (AtkHypertext *hypertext,
                                             gint          char_index);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_HYPERTEXT_H__ */

Modified: trunk/atk/atkimage.h
==============================================================================
--- trunk/atk/atkimage.h	(original)
+++ trunk/atk/atkimage.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_IMAGE_H__
 #define __ATK_IMAGE_H__
 
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The AtkImage interface should be supported by any object that has an 
@@ -80,7 +82,6 @@
 
 G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage   *image);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
 #endif /* __ATK_IMAGE_H__ */

Modified: trunk/atk/atkmisc.h
==============================================================================
--- trunk/atk/atkmisc.h	(original)
+++ trunk/atk/atkmisc.h	Thu Jun  5 09:03:47 2008
@@ -17,14 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_MISC_H__
 #define __ATK_MISC_H__
 
 #include <glib-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define ATK_TYPE_MISC                   (atk_misc_get_type ())
 #define ATK_IS_MISC(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_MISC)
@@ -82,9 +84,6 @@
  */
 const AtkMisc *atk_misc_get_instance (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_MISC_H__ */

Modified: trunk/atk/atknoopobject.h
==============================================================================
--- trunk/atk/atknoopobject.h	(original)
+++ trunk/atk/atknoopobject.h	Thu Jun  5 09:03:47 2008
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_NO_OP_OBJECT_H__
 #define __ATK_NO_OP_OBJECT_H__
 

Modified: trunk/atk/atknoopobjectfactory.h
==============================================================================
--- trunk/atk/atknoopobjectfactory.h	(original)
+++ trunk/atk/atknoopobjectfactory.h	Thu Jun  5 09:03:47 2008
@@ -17,14 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_NO_OP_OBJECT_FACTORY_H__
 #define __ATK_NO_OP_OBJECT_FACTORY_H__
 
 #include <atk/atkobjectfactory.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define ATK_TYPE_NO_OP_OBJECT_FACTORY                (atk_no_op_object_factory_get_type ())
 #define ATK_NO_OP_OBJECT_FACTORY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT_FACTORY, AtkNoOpObjectFactory))
@@ -50,9 +52,6 @@
 
 AtkObjectFactory *atk_no_op_object_factory_new(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_NO_OP_OBJECT_FACTORY_H__ */

Modified: trunk/atk/atkobject.h
==============================================================================
--- trunk/atk/atkobject.h	(original)
+++ trunk/atk/atkobject.h	Thu Jun  5 09:03:47 2008
@@ -17,17 +17,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_OBJECT_H__
 #define __ATK_OBJECT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <glib-object.h>
 #include <atk/atkstate.h>
 #include <atk/atkrelationtype.h>
 
+G_BEGIN_DECLS
+
 /*
  * AtkObject represents the minimum information all accessible objects
  * return. This information includes accessible name, accessible
@@ -640,9 +642,6 @@
  *    cpos = atk_text_get_caret_position (ATK_TEXT (accessible));
  */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_OBJECT_H__ */

Modified: trunk/atk/atkobjectfactory.h
==============================================================================
--- trunk/atk/atkobjectfactory.h	(original)
+++ trunk/atk/atkobjectfactory.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_OBJECT_FACTORY_H__
 #define __ATK_OBJECT_FACTORY_H__
 
 #include <glib-object.h>
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define ATK_TYPE_OBJECT_FACTORY                     (atk_object_factory_get_type ())
 #define ATK_OBJECT_FACTORY(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT_FACTORY, AtkObjectFactory))
@@ -59,10 +61,7 @@
 AtkObject* atk_object_factory_create_accessible (AtkObjectFactory *factory, GObject *obj);
 void       atk_object_factory_invalidate (AtkObjectFactory *factory);
 GType      atk_object_factory_get_accessible_type (AtkObjectFactory *factory);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __GTK_OBJECT_FACTORY_H__ */
-

Modified: trunk/atk/atkregistry.h
==============================================================================
--- trunk/atk/atkregistry.h	(original)
+++ trunk/atk/atkregistry.h	Thu Jun  5 09:03:47 2008
@@ -17,16 +17,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_REGISTRY_H__
 #define __ATK_REGISTRY_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <glib-object.h>
 #include "atkobjectfactory.h"
 
+G_BEGIN_DECLS
+
 #define ATK_TYPE_REGISTRY                (atk_registry_get_type ())
 #define ATK_REGISTRY(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_REGISTRY, AtkRegistry))
 #define ATK_REGISTRY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_REGISTRY, AtkRegistryClass))
@@ -61,9 +63,7 @@
 
 AtkRegistry*      atk_get_default_registry      (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __ATK_REGISTRY_H__ */
 

Modified: trunk/atk/atkrelation.h
==============================================================================
--- trunk/atk/atkrelation.h	(original)
+++ trunk/atk/atkrelation.h	Thu Jun  5 09:03:47 2008
@@ -17,12 +17,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_RELATION_H__
 #define __ATK_RELATION_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include <glib-object.h>
 #include <atk/atkrelationtype.h>
@@ -79,10 +81,7 @@
 GPtrArray*            atk_relation_get_target         (AtkRelation     *relation);
 void                  atk_relation_add_target         (AtkRelation     *relation,
                                                        AtkObject       *target);
-                
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __ATK_RELATION_H__ */

Modified: trunk/atk/atkrelationset.h
==============================================================================
--- trunk/atk/atkrelationset.h	(original)
+++ trunk/atk/atkrelationset.h	Thu Jun  5 09:03:47 2008
@@ -17,12 +17,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_RELATION_SET_H__
 #define __ATK_RELATION_SET_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include <glib-object.h>
 #include <atk/atkobject.h>
@@ -71,9 +73,6 @@
                                                        AtkRelationType relationship,
                                                        AtkObject       *target);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_RELATION_SET_H__ */

Modified: trunk/atk/atkrelationtype.h
==============================================================================
--- trunk/atk/atkrelationtype.h	(original)
+++ trunk/atk/atkrelationtype.h	Thu Jun  5 09:03:47 2008
@@ -17,12 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_RELATION_TYPE_H__
 #define __ATK_RELATION_TYPE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <glib.h>
+
+G_BEGIN_DECLS
 
 /**
  *AtkRelationType:
@@ -72,8 +76,6 @@
   ATK_RELATION_LAST_DEFINED
 } AtkRelationType;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __ATK_RELATION_TYPE_H__ */

Modified: trunk/atk/atkselection.h
==============================================================================
--- trunk/atk/atkselection.h	(original)
+++ trunk/atk/atkselection.h	Thu Jun  5 09:03:47 2008
@@ -17,14 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_SELECTION_H__
 #define __ATK_SELECTION_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * This AtkSelection interface provides the standard mechanism for an 
@@ -88,9 +90,6 @@
 
 gboolean     atk_selection_select_all_selection (AtkSelection   *selection);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_SELECTION_H__ */

Modified: trunk/atk/atkstate.h
==============================================================================
--- trunk/atk/atkstate.h	(original)
+++ trunk/atk/atkstate.h	Thu Jun  5 09:03:47 2008
@@ -17,15 +17,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_STATE_H__
 #define __ATK_STATE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 /**
  *AtkStateType:
  * ATK_STATE_INVALID: Indicates an invalid state - probably an error condition.
@@ -171,8 +173,6 @@
 G_CONST_RETURN gchar* atk_state_type_get_name   (AtkStateType type);
 AtkStateType          atk_state_type_for_name   (const gchar  *name);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __ATK_STATE_H__ */

Modified: trunk/atk/atkstateset.h
==============================================================================
--- trunk/atk/atkstateset.h	(original)
+++ trunk/atk/atkstateset.h	Thu Jun  5 09:03:47 2008
@@ -17,17 +17,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_STATE_SET_H__
 #define __ATK_STATE_SET_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <glib-object.h>
 #include <atk/atkobject.h>
 #include <atk/atkstate.h>
 
+G_BEGIN_DECLS
+
 #define ATK_TYPE_STATE_SET                        (atk_state_set_get_type ())
 #define ATK_STATE_SET(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_STATE_SET, AtkStateSet))
 #define ATK_STATE_SET_CLASS(klass)                (G_TYPE_CHECK_CLASS_CAST ((klass), ATK_TYPE_STATE_SET, AtkStateSetClass))
@@ -73,9 +75,6 @@
 AtkStateSet*    atk_state_set_xor_sets          (AtkStateSet  *set,
                                                  AtkStateSet  *compare_set);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_STATE_SET_H__ */

Modified: trunk/atk/atkstreamablecontent.h
==============================================================================
--- trunk/atk/atkstreamablecontent.h	(original)
+++ trunk/atk/atkstreamablecontent.h	Thu Jun  5 09:03:47 2008
@@ -17,14 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_STREAMABLE_CONTENT_H__
 #define __ATK_STREAMABLE_CONTENT_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define ATK_TYPE_STREAMABLE_CONTENT           (atk_streamable_content_get_type ())
 #define ATK_IS_STREAMABLE_CONTENT(obj)        G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_STREAMABLE_CONTENT)
@@ -98,10 +100,6 @@
 gchar*                  atk_streamable_content_get_uri          (AtkStreamableContent     *streamable,
                                                                  const gchar              *mime_type);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_STREAMABLE_CONTENT_H__ */

Modified: trunk/atk/atktable.h
==============================================================================
--- trunk/atk/atktable.h	(original)
+++ trunk/atk/atktable.h	Thu Jun  5 09:03:47 2008
@@ -17,14 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_TABLE_H__
 #define __ATK_TABLE_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * AtkTable describes a user-interface component that presents data in
@@ -210,9 +212,6 @@
                                                  (AtkTable         *table,
                                                   gint             column);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_TABLE_H__ */

Modified: trunk/atk/atktext.h
==============================================================================
--- trunk/atk/atktext.h	(original)
+++ trunk/atk/atktext.h	Thu Jun  5 09:03:47 2008
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
 
 #ifndef __ATK_TEXT_H__
 #define __ATK_TEXT_H__
@@ -25,9 +28,7 @@
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /**
  *AtkTextAttribute
@@ -359,9 +360,6 @@
 G_CONST_RETURN gchar*  atk_text_attribute_get_value       (AtkTextAttribute attr,
                                                            gint             index_);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_TEXT_H__ */

Modified: trunk/atk/atkutil.h
==============================================================================
--- trunk/atk/atkutil.h	(original)
+++ trunk/atk/atkutil.h	Thu Jun  5 09:03:47 2008
@@ -17,14 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_UTIL_H__
 #define __ATK_UTIL_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define ATK_TYPE_UTIL                   (atk_util_get_type ())
 #define ATK_IS_UTIL(obj)                G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_UTIL)
@@ -306,10 +308,6 @@
   return g_define_type_id__volatile;	\
 } /* closes type_name##_get_type() */
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_UTIL_H__ */

Modified: trunk/atk/atkvalue.h
==============================================================================
--- trunk/atk/atkvalue.h	(original)
+++ trunk/atk/atkvalue.h	Thu Jun  5 09:03:47 2008
@@ -17,14 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_VALUE_H__
 #define __ATK_VALUE_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The AtkValue interface should be supported by any object that 
@@ -86,10 +88,6 @@
  *       (the accessible value has changed)
  */
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_VALUE_H__ */

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jun  5 09:03:47 2008
@@ -132,6 +132,8 @@
                               [disable all source autogeneration rules])],,
               [enable_rebuilds=yes])
 
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"
+
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
   case " $CFLAGS " in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]