Revert "Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_1...

[platform/upstream/atk.git] / atk / atknoopobject.h

diff --git a/atk/atknoopobject.h b/atk/atknoopobject.h
index 0a12fe9..9c02a19 100644 (file)
--- a/atk/atknoopobject.h
+++ b/atk/atknoopobject.h
@@ -17,13 +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
+
+#include <atk/atkversion.h>
+
 #ifndef __ATK_NO_OP_OBJECT_H__
 #define __ATK_NO_OP_OBJECT_H__
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define ATK_TYPE_NO_OP_OBJECT                (atk_no_op_object_get_type ())
 #define ATK_NO_OP_OBJECT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_NO_OP_OBJECT, AtkNoOpObject))
@@ -40,18 +43,17 @@ struct _AtkNoOpObject
   AtkObject     parent;
 };
 
-GType agtk_widget_get_type (void);
+ATK_AVAILABLE_IN_ALL
+GType atk_no_op_object_get_type (void);
 
 struct _AtkNoOpObjectClass
 {
   AtkObjectClass parent_class;
 };
 
+ATK_AVAILABLE_IN_ALL
 AtkObject *atk_no_op_object_new (GObject  *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_NO_OP_OBJECT_H__ */