use fabs() on a double instead of abs()

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

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 565e4250f4d7d66b1fb9022043c383a30f928bfd..6d2d4d9b7bf9a2c8a9e3a8ea5a83eaf6cca0d727 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" {
@@ -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);
@@ -130,7 +132,34 @@ struct _GdkDrawableClass
                                           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);
+
+  void         (*_gdk_reserved1) (void);
+  void         (*_gdk_reserved2) (void);
+  void         (*_gdk_reserved3) (void);
+  void         (*_gdk_reserved4) (void);
+  void         (*_gdk_reserved5) (void);
+  void         (*_gdk_reserved6) (void);
 };
 
 GType           gdk_drawable_get_type     (void);
@@ -138,12 +167,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,
@@ -153,8 +184,11 @@ 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);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkDrawable*    gdk_drawable_ref          (GdkDrawable    *drawable);
 void            gdk_drawable_unref        (GdkDrawable    *drawable);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 /* Drawing
  */
@@ -189,6 +223,7 @@ void gdk_draw_polygon   (GdkDrawable      *drawable,
                         gint              filled,
                         GdkPoint         *points,
                         gint              npoints);
+#ifndef GDK_DISABLE_DEPRECATED
 void gdk_draw_string    (GdkDrawable      *drawable,
                         GdkFont          *font,
                         GdkGC            *gc,
@@ -209,6 +244,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,
@@ -272,6 +308,11 @@ void gdk_draw_layout_with_colors      (GdkDrawable     *drawable,
                                        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,