Add in a awful hack to force gdkenumtypes.h to be updated before building

[~andy/gtk] / gdk / gdkdrawable.h

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 0091858ef532b9141b27dfdb2a43c4df5e8f5856..e81d3935d82c9e8866b179352e95f2da79ee2299 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -3,6 +3,8 @@
 
 #include <gdk/gdktypes.h>
 #include <gdk/gdkgc.h>
+#include <gdk/gdkrgb.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,14 +33,14 @@ struct _GdkDrawableClass
                          GdkGCValuesMask mask);
   void (*draw_rectangle) (GdkDrawable  *drawable,
                          GdkGC        *gc,
-                         gint          filled,
+                         gboolean      filled,
                          gint          x,
                          gint          y,
                          gint          width,
                          gint          height);
   void (*draw_arc)       (GdkDrawable  *drawable,
                          GdkGC        *gc,
-                         gint          filled,
+                         gboolean      filled,
                          gint          x,
                          gint          y,
                          gint          width,
@@ -47,7 +49,7 @@ struct _GdkDrawableClass
                          gint          angle2);
   void (*draw_polygon)   (GdkDrawable  *drawable,
                          GdkGC        *gc,
-                         gint          filled,
+                         gboolean      filled,
                          GdkPoint     *points,
                          gint          npoints);
   void (*draw_text)      (GdkDrawable  *drawable,
@@ -81,7 +83,7 @@ struct _GdkDrawableClass
                          GdkGC        *gc,
                          GdkSegment   *segs,
                          gint          nsegs);
-  void (*draw_lines)     (GdkDrawable  *drawable,
+ void (*draw_lines)     (GdkDrawable  *drawable,
                          GdkGC        *gc,
                          GdkPoint     *points,
                          gint          npoints);
@@ -111,8 +113,64 @@ struct _GdkDrawableClass
   void (*set_colormap)   (GdkDrawable  *drawable,
                           GdkColormap  *cmap);
 
-  GdkColormap* (*get_colormap) (GdkDrawable *drawable);
-  GdkVisual*   (*get_visual) (GdkDrawable  *drawable);
+  GdkColormap* (*get_colormap) (GdkDrawable  *drawable);
+  GdkVisual*   (*get_visual)   (GdkDrawable  *drawable);
+  GdkScreen*   (*get_screen)   (GdkDrawable  *drawable);
+
+  GdkImage*    (*get_image)  (GdkDrawable  *drawable,
+                              gint          x,
+                              gint          y,
+                              gint          width,
+                              gint          height);
+
+  GdkRegion*   (*get_clip_region)    (GdkDrawable  *drawable);
+  GdkRegion*   (*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_pixbuf) (GdkDrawable *drawable,
+                              GdkGC       *gc,
+                              GdkPixbuf   *pixbuf,
+                              gint         src_x,
+                              gint         src_y,
+                              gint         dest_x,
+                              gint         dest_y,
+                              gint         width,
+                              gint         height,
+                              GdkRgbDither dither,
+                              gint         x_dither,
+                              gint         y_dither);
+  GdkImage*    (*_copy_to_image) (GdkDrawable    *drawable,
+                                 GdkImage       *image,
+                                 gint            src_x,
+                                 gint            src_y,
+                                 gint            dest_x,
+                                 gint            dest_y,
+                                 gint            width,
+                                 gint            height);
+
+  /* Padding for future expansion */
+  void         (*_gdk_reserved1)  (void);
+  void         (*_gdk_reserved2)  (void);
+  void         (*_gdk_reserved3)  (void);
+  void         (*_gdk_reserved4)  (void);
+  void         (*_gdk_reserved5)  (void);
+  void         (*_gdk_reserved6)  (void);
+  void         (*_gdk_reserved7)  (void);
+  void         (*_gdk_reserved9)  (void);
+  void         (*_gdk_reserved10) (void);
+  void         (*_gdk_reserved11) (void);
+  void         (*_gdk_reserved12) (void);
+  void         (*_gdk_reserved13) (void);
+  void         (*_gdk_reserved14) (void);
+  void         (*_gdk_reserved15) (void);
+  void         (*_gdk_reserved16) (void);
 };
 
 GType           gdk_drawable_get_type     (void);
@@ -120,12 +178,14 @@ GType           gdk_drawable_get_type     (void);
 /* Manipulation of drawables
  */
 
+#ifndef GDK_DISABLE_DEPRECATED
 void            gdk_drawable_set_data     (GdkDrawable    *drawable,
                                           const gchar    *key,
                                           gpointer       data,
                                           GDestroyNotify  destroy_func);
 gpointer        gdk_drawable_get_data     (GdkDrawable    *drawable,
                                           const gchar    *key);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 void            gdk_drawable_get_size     (GdkDrawable   *drawable,
                                           gint           *width,
@@ -135,8 +195,13 @@ void               gdk_drawable_set_colormap (GdkDrawable    *drawable,
 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);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkDrawable*    gdk_drawable_ref          (GdkDrawable    *drawable);
 void            gdk_drawable_unref        (GdkDrawable    *drawable);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 /* Drawing
  */
@@ -146,20 +211,20 @@ void gdk_draw_point     (GdkDrawable      *drawable,
                         gint              y);
 void gdk_draw_line      (GdkDrawable      *drawable,
                         GdkGC            *gc,
-                        gint              x1,
-                        gint              y1,
-                        gint              x2,
-                        gint              y2);
+                        gint              x1_,
+                        gint              y1_,
+                        gint              x2_,
+                        gint              y2_);
 void gdk_draw_rectangle (GdkDrawable      *drawable,
                         GdkGC            *gc,
-                        gint              filled,
+                        gboolean          filled,
                         gint              x,
                         gint              y,
                         gint              width,
                         gint              height);
 void gdk_draw_arc       (GdkDrawable      *drawable,
                         GdkGC            *gc,
-                        gint              filled,
+                        gboolean          filled,
                         gint              x,
                         gint              y,
                         gint              width,
@@ -168,9 +233,10 @@ void gdk_draw_arc       (GdkDrawable      *drawable,
                         gint              angle2);
 void gdk_draw_polygon   (GdkDrawable      *drawable,
                         GdkGC            *gc,
-                        gint              filled,
+                        gboolean          filled,
                         GdkPoint         *points,
                         gint              npoints);
+#ifndef GDK_DISABLE_DEPRECATED
 void gdk_draw_string    (GdkDrawable      *drawable,
                         GdkFont          *font,
                         GdkGC            *gc,
@@ -191,6 +257,7 @@ void gdk_draw_text_wc   (GdkDrawable      *drawable,
                         gint              y,
                         const GdkWChar   *text,
                         gint              text_length);
+#endif /* GDK_DISABLE_DEPRECATED */
 void gdk_draw_drawable  (GdkDrawable      *drawable,
                         GdkGC            *gc,
                         GdkDrawable      *src,
@@ -221,6 +288,18 @@ void gdk_draw_lines     (GdkDrawable      *drawable,
                         GdkGC            *gc,
                         GdkPoint         *points,
                         gint              npoints);
+void gdk_draw_pixbuf    (GdkDrawable      *drawable,
+                        GdkGC            *gc,
+                        GdkPixbuf        *pixbuf,
+                        gint              src_x,
+                        gint              src_y,
+                        gint              dest_x,
+                        gint              dest_y,
+                        gint              width,
+                        gint              height,
+                        GdkRgbDither      dither,
+                        gint              x_dither,
+                        gint              y_dither);
 
 void gdk_draw_glyphs      (GdkDrawable      *drawable,
                           GdkGC            *gc,
@@ -239,6 +318,35 @@ void gdk_draw_layout      (GdkDrawable      *drawable,
                           gint              y,
                           PangoLayout      *layout);
 
+void gdk_draw_layout_line_with_colors (GdkDrawable     *drawable,
+                                       GdkGC           *gc,
+                                       gint             x,
+                                       gint             y,
+                                       PangoLayoutLine *line,
+                                       GdkColor        *foreground,
+                                       GdkColor        *background);
+void gdk_draw_layout_with_colors      (GdkDrawable     *drawable,
+                                       GdkGC           *gc,
+                                       gint             x,
+                                       gint             y,
+                                       PangoLayout     *layout,
+                                       GdkColor        *foreground,
+                                       GdkColor        *background);
+
+#ifndef GDK_DISABLE_DEPRECATED
+#define gdk_draw_pixmap                gdk_draw_drawable
+#define gdk_draw_bitmap                gdk_draw_drawable
+#endif /* GDK_DISABLE_DEPRECATED */
+
+GdkImage* gdk_drawable_get_image (GdkDrawable *drawable,
+                                  gint         x,
+                                  gint         y,
+                                  gint         width,
+                                  gint         height);
+
+GdkRegion *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
+GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */