Revert name change

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

diff --git a/gdk/gdkregion.h b/gdk/gdkregion.h
index ce31ba03d265fa34efc39899790a91f50cfb0806..b7381eaf4dccc6b0af07d3996b37087191744c35 100644 (file)
--- a/gdk/gdkregion.h
+++ b/gdk/gdkregion.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_REGION_H__
 #define __GDK_REGION_H__
 
@@ -53,55 +57,55 @@ typedef enum
   GDK_OVERLAP_RECTANGLE_PART
 } GdkOverlapType;
 
-typedef void (*GdkSpanFunc) (GdkSpan *span,
-                            gpointer data);
-
-GdkRegion *gdk_region_new       (void);
-GdkRegion *gdk_region_polygon   (GdkPoint     *points,
-                                gint          npoints,
-                                GdkFillRule   fill_rule);
-GdkRegion *gdk_region_copy      (GdkRegion    *region);
-GdkRegion *gdk_region_rectangle (GdkRectangle *rectangle);
-void       gdk_region_destroy   (GdkRegion    *region);
-
-void          gdk_region_get_clipbox    (GdkRegion     *region,
-                                          GdkRectangle  *rectangle);
-void           gdk_region_get_rectangles (GdkRegion     *region,
-                                          GdkRectangle **rectangles,
-                                          gint          *n_rectangles);
-
-gboolean       gdk_region_empty    (GdkRegion    *region);
-gboolean       gdk_region_equal    (GdkRegion    *region1,
-                                   GdkRegion    *region2);
-gboolean       gdk_region_point_in (GdkRegion    *region,
-                                   int           x,
-                                   int           y);
-GdkOverlapType gdk_region_rect_in  (GdkRegion    *region,
-                                   GdkRectangle *rectangle);
-
-void gdk_region_offset          (GdkRegion    *region,
-                                gint          dx,
-                                gint          dy);
-void gdk_region_shrink          (GdkRegion    *region,
-                                gint          dx,
-                                gint          dy);
-void gdk_region_union_with_rect (GdkRegion    *region,
-                                GdkRectangle *rect);
-void gdk_region_intersect       (GdkRegion    *source1,
-                                GdkRegion    *source2);
-void gdk_region_union           (GdkRegion    *source1,
-                                GdkRegion    *source2);
-void gdk_region_subtract        (GdkRegion    *source1,
-                                GdkRegion    *source2);
-void gdk_region_xor             (GdkRegion    *source1,
-                                GdkRegion    *source2);
-
-void gdk_region_spans_intersect_foreach (GdkRegion   *region,
-                                        GdkSpan     *spans,
-                                        int          n_spans,
-                                        gboolean     sorted,
-                                        GdkSpanFunc  function,
-                                        gpointer     data);
+typedef void (* GdkSpanFunc) (GdkSpan *span,
+                              gpointer data);
+
+GdkRegion    * gdk_region_new             (void);
+GdkRegion    * gdk_region_polygon         (const GdkPoint     *points,
+                                           gint                n_points,
+                                           GdkFillRule         fill_rule);
+GdkRegion    * gdk_region_copy            (const GdkRegion    *region);
+GdkRegion    * gdk_region_rectangle       (const GdkRectangle *rectangle);
+void           gdk_region_destroy         (GdkRegion          *region);
+
+void          gdk_region_get_clipbox     (const GdkRegion    *region,
+                                           GdkRectangle       *rectangle);
+void           gdk_region_get_rectangles  (const GdkRegion    *region,
+                                           GdkRectangle      **rectangles,
+                                           gint               *n_rectangles);
+
+gboolean       gdk_region_empty           (const GdkRegion    *region);
+gboolean       gdk_region_equal           (const GdkRegion    *region1,
+                                           const GdkRegion    *region2);
+gboolean       gdk_region_point_in        (const GdkRegion    *region,
+                                           int                 x,
+                                           int                 y);
+GdkOverlapType gdk_region_rect_in         (const GdkRegion    *region,
+                                           const GdkRectangle *rectangle);
+
+void           gdk_region_offset          (GdkRegion          *region,
+                                           gint                dx,
+                                           gint                dy);
+void           gdk_region_shrink          (GdkRegion          *region,
+                                           gint                dx,
+                                           gint                dy);
+void           gdk_region_union_with_rect (GdkRegion          *region,
+                                           const GdkRectangle *rect);
+void           gdk_region_intersect       (GdkRegion          *source1,
+                                           const GdkRegion    *source2);
+void           gdk_region_union           (GdkRegion          *source1,
+                                           const GdkRegion    *source2);
+void           gdk_region_subtract        (GdkRegion          *source1,
+                                           const GdkRegion    *source2);
+void           gdk_region_xor             (GdkRegion          *source1,
+                                           const GdkRegion    *source2);
+
+void   gdk_region_spans_intersect_foreach (GdkRegion          *region,
+                                           const GdkSpan      *spans,
+                                           int                 n_spans,
+                                           gboolean            sorted,
+                                           GdkSpanFunc         function,
+                                           gpointer            data);
 
 G_END_DECLS