]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkdrawable.h
Fix missing (transfer) annotations in GDK
[~andy/gtk] / gdk / gdkdrawable.h
index fcad892f06165cff7b053957888e64d889440cd5..a32c18524f7b3ee1e52209bcd877713c61ffb4eb 100644 (file)
@@ -32,7 +32,6 @@
 #define __GDK_DRAWABLE_H__
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkgc.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <cairo.h>
@@ -40,7 +39,6 @@
 G_BEGIN_DECLS
 
 typedef struct _GdkDrawableClass GdkDrawableClass;
-typedef struct _GdkTrapezoid     GdkTrapezoid;
 
 #define GDK_TYPE_DRAWABLE              (gdk_drawable_get_type ())
 #define GDK_DRAWABLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE, GdkDrawable))
@@ -49,6 +47,12 @@ typedef struct _GdkTrapezoid     GdkTrapezoid;
 #define GDK_IS_DRAWABLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAWABLE))
 #define GDK_DRAWABLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAWABLE, GdkDrawableClass))
 
+/**
+ * GdkDrawable:
+ *
+ * An opaque structure representing an object that can be
+ * drawn onto.
+ */
 struct _GdkDrawable
 {
   GObject parent_instance;
@@ -58,98 +62,11 @@ struct _GdkDrawableClass
 {
   GObjectClass parent_class;
   
-  GdkGC *(*create_gc)    (GdkDrawable    *drawable,
-                         GdkGCValues    *values,
-                         GdkGCValuesMask mask);
-  void (*draw_rectangle) (GdkDrawable  *drawable,
-                         GdkGC        *gc,
-                         gboolean      filled,
-                         gint          x,
-                         gint          y,
-                         gint          width,
-                         gint          height);
-  void (*draw_arc)       (GdkDrawable  *drawable,
-                         GdkGC        *gc,
-                         gboolean      filled,
-                         gint          x,
-                         gint          y,
-                         gint          width,
-                         gint          height,
-                         gint          angle1,
-                         gint          angle2);
-  void (*draw_polygon)   (GdkDrawable  *drawable,
-                         GdkGC        *gc,
-                         gboolean      filled,
-                         GdkPoint     *points,
-                         gint          npoints);
-  void (*draw_drawable)  (GdkDrawable  *drawable,
-                         GdkGC        *gc,
-                         GdkDrawable  *src,
-                         gint          xsrc,
-                         gint          ysrc,
-                         gint          xdest,
-                         gint          ydest,
-                         gint          width,
-                         gint          height);
-  void (*draw_points)   (GdkDrawable  *drawable,
-                         GdkGC        *gc,
-                         GdkPoint     *points,
-                         gint          npoints);
-  void (*draw_segments)         (GdkDrawable  *drawable,
-                         GdkGC        *gc,
-                         GdkSegment   *segs,
-                         gint          nsegs);
-  void (*draw_lines)     (GdkDrawable  *drawable,
-                         GdkGC        *gc,
-                         GdkPoint     *points,
-                         gint          npoints);
-
-  void (*draw_glyphs)    (GdkDrawable      *drawable,
-                         GdkGC            *gc,
-                         PangoFont        *font,
-                         gint              x,
-                         gint              y,
-                         PangoGlyphString *glyphs);
-
-  gint (*get_depth)      (GdkDrawable  *drawable);
-  void (*get_size)       (GdkDrawable  *drawable,
-                          gint         *width,
-                          gint         *height);
-
-  void (*set_colormap)   (GdkDrawable  *drawable,
-                          GdkColormap  *cmap);
-
-  GdkColormap* (*get_colormap) (GdkDrawable  *drawable);
-  GdkVisual*   (*get_visual)   (GdkDrawable  *drawable);
-  GdkScreen*   (*get_screen)   (GdkDrawable  *drawable);
-
   cairo_region_t*   (*get_clip_region)    (GdkDrawable  *drawable);
   cairo_region_t*   (*get_visible_region) (GdkDrawable  *drawable);
 
-  GdkDrawable* (*get_composite_drawable) (GdkDrawable *drawable,
-                                          gint         x,
-                                          gint         y,
-                                          gint         width,
-                                          gint         height,
-                                          gint        *composite_x_offset,
-                                          gint        *composite_y_offset);
-
-  void (*draw_glyphs_transformed) (GdkDrawable      *drawable,
-                                  GdkGC            *gc,
-                                  PangoMatrix      *matrix,
-                                  PangoFont        *font,
-                                  gint              x,
-                                  gint              y,
-                                  PangoGlyphString *glyphs);
-  void (*draw_trapezoids)         (GdkDrawable      *drawable,
-                                  GdkGC            *gc,
-                                  GdkTrapezoid     *trapezoids,
-                                  gint              n_trapezoids);
-
   cairo_surface_t *(*ref_cairo_surface) (GdkDrawable *drawable);
 
-  GdkDrawable *(*get_source_drawable) (GdkDrawable *drawable);
-
   void         (*set_cairo_clip)      (GdkDrawable *drawable,
                                       cairo_t *cr);
 
@@ -157,17 +74,6 @@ struct _GdkDrawableClass
                                             int width,
                                             int height);
 
-  void (*draw_drawable_with_src)  (GdkDrawable  *drawable,
-                                  GdkGC               *gc,
-                                  GdkDrawable  *src,
-                                  gint         xsrc,
-                                  gint         ysrc,
-                                  gint         xdest,
-                                  gint         ydest,
-                                  gint         width,
-                                  gint         height,
-                                  GdkDrawable  *original_src);
-
   /* Padding for future expansion */
   void         (*_gdk_reserved7)  (void);
   void         (*_gdk_reserved9)  (void);
@@ -179,126 +85,8 @@ struct _GdkDrawableClass
   void         (*_gdk_reserved15) (void);
 };
 
-struct _GdkTrapezoid
-{
-  double y1, x11, x21, y2, x12, x22;
-};
-
 GType           gdk_drawable_get_type     (void) G_GNUC_CONST;
 
-/* Manipulation of drawables
- */
-void            gdk_drawable_get_size     (GdkDrawable   *drawable,
-                                          gint           *width,
-                                          gint           *height);
-void           gdk_drawable_set_colormap (GdkDrawable    *drawable,
-                                          GdkColormap    *colormap);
-GdkColormap*    gdk_drawable_get_colormap (GdkDrawable   *drawable);
-GdkVisual*      gdk_drawable_get_visual   (GdkDrawable   *drawable);
-gint            gdk_drawable_get_depth    (GdkDrawable   *drawable);
-GdkScreen*     gdk_drawable_get_screen   (GdkDrawable    *drawable);
-GdkDisplay*    gdk_drawable_get_display  (GdkDrawable    *drawable);
-
-/* Drawing
- */
-void gdk_draw_point     (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        gint              x,
-                        gint              y);
-void gdk_draw_line      (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        gint              x1_,
-                        gint              y1_,
-                        gint              x2_,
-                        gint              y2_);
-void gdk_draw_rectangle (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        gboolean          filled,
-                        gint              x,
-                        gint              y,
-                        gint              width,
-                        gint              height);
-void gdk_draw_arc       (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        gboolean          filled,
-                        gint              x,
-                        gint              y,
-                        gint              width,
-                        gint              height,
-                        gint              angle1,
-                        gint              angle2);
-void gdk_draw_polygon   (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        gboolean          filled,
-                        const GdkPoint   *points,
-                        gint              n_points);
-void gdk_draw_drawable  (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        GdkDrawable      *src,
-                        gint              xsrc,
-                        gint              ysrc,
-                        gint              xdest,
-                        gint              ydest,
-                        gint              width,
-                        gint              height);
-void gdk_draw_points    (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        const GdkPoint   *points,
-                        gint              n_points);
-void gdk_draw_segments  (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        const GdkSegment *segs,
-                        gint              n_segs);
-void gdk_draw_lines     (GdkDrawable      *drawable,
-                        GdkGC            *gc,
-                        const GdkPoint   *points,
-                        gint              n_points);
-
-void gdk_draw_glyphs      (GdkDrawable      *drawable,
-                          GdkGC            *gc,
-                          PangoFont        *font,
-                          gint              x,
-                          gint              y,
-                          PangoGlyphString *glyphs);
-void gdk_draw_layout_line (GdkDrawable      *drawable,
-                          GdkGC            *gc,
-                          gint              x,
-                          gint              y,
-                          PangoLayoutLine  *line);
-void gdk_draw_layout      (GdkDrawable      *drawable,
-                          GdkGC            *gc,
-                          gint              x,
-                          gint              y,
-                          PangoLayout      *layout);
-
-void gdk_draw_layout_line_with_colors (GdkDrawable     *drawable,
-                                       GdkGC           *gc,
-                                       gint             x,
-                                       gint             y,
-                                       PangoLayoutLine *line,
-                                       const GdkColor  *foreground,
-                                       const GdkColor  *background);
-void gdk_draw_layout_with_colors      (GdkDrawable     *drawable,
-                                       GdkGC           *gc,
-                                       gint             x,
-                                       gint             y,
-                                       PangoLayout     *layout,
-                                       const GdkColor  *foreground,
-                                       const GdkColor  *background);
-
-void gdk_draw_glyphs_transformed (GdkDrawable        *drawable,
-                                 GdkGC              *gc,
-                                 const PangoMatrix  *matrix,
-                                 PangoFont          *font,
-                                 gint                x,
-                                 gint                y,
-                                 PangoGlyphString   *glyphs);
-void gdk_draw_trapezoids         (GdkDrawable        *drawable,
-                                 GdkGC              *gc,
-                                 const GdkTrapezoid *trapezoids,
-                                 gint                n_trapezoids);
-
-
 cairo_region_t *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
 cairo_region_t *gdk_drawable_get_visible_region (GdkDrawable *drawable);