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

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

diff --git a/atk/atkimage.h b/atk/atkimage.h
index 51ec881..4905cd1 100755 (executable)
--- a/atk/atkimage.h
+++ b/atk/atkimage.h
@@ -17,14 +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 
@@ -41,60 +44,47 @@ extern "C" {
 #define _TYPEDEF_ATK_IMAGE_
 typedef struct _AtkImage AtkImage;
 #endif
-
-typedef enum
-{
-  ATK_IMAGE_EMPTY,
-  ATK_IMAGE_PIXMAP,
-  ATK_IMAGE_IMAGE,
-  ATK_IMAGE_PIXBUF,
-  ATK_IMAGE_STOCK,
-  ATK_IMAGE_ICON_SET
-} AtkImageType;
+typedef struct _AtkImageIface AtkImageIface;
 
 struct _AtkImageIface
 {
   GTypeInterface parent;
-
-  /*
-   * Gets the type of representation being used to store image data
-   */
-  AtkImageType     (*get_storage_type)              (AtkImage              *image);
-  /*
-   * Gets the description of the image
-   */
-  G_CONST_RETURN   gchar* ( *get_image_description) (AtkImage              *image);
-  /*
-   * Gets the height of the image
-   */
-  gint   ( *get_image_height)      (AtkImage              *image);
-  /*
-   * Gets the width of the image
-   */
-  gint   ( *get_image_width)       (AtkImage              *image);
-  /*
-   * Sets the description of the image
-   */
-  void   ( *set_image_description) (AtkImage              *image,
-                                    const gchar           *description);
-
+  void                 ( *get_image_position)    (AtkImage              *image,
+                                                   gint                  *x,
+                                                  gint                  *y,
+                                                  AtkCoordType          coord_type);
+  const gchar*          ( *get_image_description) (AtkImage              *image);
+  void                  ( *get_image_size)        (AtkImage              *image,
+                                                   gint                  *width,
+                                                   gint                  *height);
+  gboolean              ( *set_image_description) (AtkImage              *image,
+                                                   const gchar           *description);
+  const gchar*          ( *get_image_locale)      (AtkImage              *image);
 };
-GType  atk_image_get_type             (void);
 
-AtkImageType          atk_image_get_storage_type      (AtkImage   *image);
-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage   *image);
-
-gint   atk_image_get_image_height      (AtkImage           *image);
+ATK_AVAILABLE_IN_ALL
+GType  atk_image_get_type             (void);
 
-gint   atk_image_get_image_width       (AtkImage           *image);
+ATK_AVAILABLE_IN_ALL
+const gchar* atk_image_get_image_description (AtkImage   *image);
 
-void   atk_image_set_image_description (AtkImage           *image,
-                                        const gchar       *description);
+ATK_AVAILABLE_IN_ALL
+void     atk_image_get_image_size        (AtkImage           *image,
+                                          gint               *width,
+                                          gint               *height);
 
+ATK_AVAILABLE_IN_ALL
+gboolean atk_image_set_image_description (AtkImage           *image,
+                                          const gchar       *description);
+ATK_AVAILABLE_IN_ALL
+void     atk_image_get_image_position    (AtkImage          *image,
+                                          gint               *x,
+                                         gint               *y,
+                                         AtkCoordType       coord_type);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+ATK_AVAILABLE_IN_ALL
+const gchar* atk_image_get_image_locale (AtkImage   *image);
 
+G_END_DECLS
 
 #endif /* __ATK_IMAGE_H__ */