diff options
author | Michael Natterer <mitch@imendio.com> | 2008-01-14 14:02:12 +0000 |
---|---|---|
committer | Michael Natterer <mitch@src.gnome.org> | 2008-01-14 14:02:12 +0000 |
commit | 92f86e049670c1696f135b32ca9b0a9ac619eed6 (patch) | |
tree | fd979d6627bdc83ecae1ff29c335be070144521e /gdk/gdkregion-generic.c | |
parent | 112dad66954c84e91300959f8d5fe20dccd5d8f1 (diff) | |
download | gtk+-92f86e049670c1696f135b32ca9b0a9ac619eed6.tar.gz |
gdk/gdk.h gdk/gdkcairo.h gdk/gdkcolor.h gdk/gdkgc.h gdk/gdkinternals.h
2008-01-14 Michael Natterer <mitch@imendio.com>
* gdk/gdk.h
* gdk/gdkcairo.h
* gdk/gdkcolor.h
* gdk/gdkgc.h
* gdk/gdkinternals.h
* gdk/gdkregion.h
* gdk/gdkwindow.h: made GdkRectangle*, GdkRegion* and GdkColor*
parameters const.
* gdk/gdkcairo.c
* gdk/gdkgc.c
* gdk/gdkwindow.c
* gdk/gdkrectangle.c
* gdk/gdkpolyreg-generic.c
* gdk/gdkregion-generic.c
* gdk/directfb/gdkcolor-directfb.c
* gdk/directfb/gdkgc-directfb.c
* gdk/directfb/gdkgeometry-directfb.c
* gdk/directfb/gdkwindow-directfb.c
* gdk/quartz/gdkcolor-quartz.c
* gdk/quartz/gdkgc-quartz.c
* gdk/quartz/gdkgeometry-quartz.c
* gdk/quartz/gdkwindow-quartz.c
* gdk/win32/gdkcolor-win32.c
* gdk/win32/gdkgc-win32.c
* gdk/win32/gdkgeometry-win32.c
* gdk/win32/gdkprivate-win32.h
* gdk/win32/gdkwindow-win32.c
* gdk/x11/gdkcolor-x11.c
* gdk/x11/gdkgc-x11.c
* gdk/x11/gdkgeometry-x11.c
* gdk/x11/gdkmain-x11.c
* gdk/x11/gdkprivate-x11.h
* gdk/x11/gdkwindow-x11.c: changed accordingly.
* gdk/gdkpolyreg-generic.c: uncruftify to have proper function
headers.
svn path=/trunk/; revision=19365
Diffstat (limited to 'gdk/gdkregion-generic.c')
-rw-r--r-- | gdk/gdkregion-generic.c | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c index 71030d7c68..f8f54a3f48 100644 --- a/gdk/gdkregion-generic.c +++ b/gdk/gdkregion-generic.c @@ -75,27 +75,27 @@ SOFTWARE. #include "gdkregion-generic.h" #include "gdkalias.h" -typedef void (*overlapFunc) (GdkRegion *pReg, - GdkRegionBox *r1, - GdkRegionBox *r1End, - GdkRegionBox *r2, - GdkRegionBox *r2End, - gint y1, - gint y2); -typedef void (*nonOverlapFunc) (GdkRegion *pReg, - GdkRegionBox *r, - GdkRegionBox *rEnd, - gint y1, - gint y2); - -static void miRegionCopy (GdkRegion *dstrgn, - GdkRegion *rgn); -static void miRegionOp (GdkRegion *newReg, - GdkRegion *reg1, - GdkRegion *reg2, - overlapFunc overlapFn, - nonOverlapFunc nonOverlap1Fn, - nonOverlapFunc nonOverlap2Fn); +typedef void (* overlapFunc) (GdkRegion *pReg, + GdkRegionBox *r1, + GdkRegionBox *r1End, + GdkRegionBox *r2, + GdkRegionBox *r2End, + gint y1, + gint y2); +typedef void (* nonOverlapFunc) (GdkRegion *pReg, + GdkRegionBox *r, + GdkRegionBox *rEnd, + gint y1, + gint y2); + +static void miRegionCopy (GdkRegion *dstrgn, + const GdkRegion *rgn); +static void miRegionOp (GdkRegion *newReg, + GdkRegion *reg1, + const GdkRegion *reg2, + overlapFunc overlapFn, + nonOverlapFunc nonOverlap1Fn, + nonOverlapFunc nonOverlap2Fn); /** * gdk_region_new: @@ -131,7 +131,7 @@ gdk_region_new (void) * Return value: a new region **/ GdkRegion * -gdk_region_rectangle (GdkRectangle *rectangle) +gdk_region_rectangle (const GdkRectangle *rectangle) { GdkRegion *temp; @@ -162,7 +162,7 @@ gdk_region_rectangle (GdkRectangle *rectangle) * Return value: a new region identical to @region **/ GdkRegion * -gdk_region_copy (GdkRegion *region) +gdk_region_copy (const GdkRegion *region) { GdkRegion *temp; @@ -184,8 +184,8 @@ gdk_region_copy (GdkRegion *region) * */ void -gdk_region_get_clipbox (GdkRegion *region, - GdkRectangle *rectangle) +gdk_region_get_clipbox (const GdkRegion *region, + GdkRectangle *rectangle) { g_return_if_fail (region != NULL); g_return_if_fail (rectangle != NULL); @@ -207,9 +207,9 @@ gdk_region_get_clipbox (GdkRegion *region, * The array returned in @rectangles must be freed with g_free(). **/ void -gdk_region_get_rectangles (GdkRegion *region, - GdkRectangle **rectangles, - gint *n_rectangles) +gdk_region_get_rectangles (const GdkRegion *region, + GdkRectangle **rectangles, + gint *n_rectangles) { gint i; @@ -241,8 +241,8 @@ gdk_region_get_rectangles (GdkRegion *region, * either @region or @rect. **/ void -gdk_region_union_with_rect (GdkRegion *region, - GdkRectangle *rect) +gdk_region_union_with_rect (GdkRegion *region, + const GdkRectangle *rect) { GdkRegion tmp_region; @@ -567,8 +567,8 @@ miIntersectO (GdkRegion *pReg, * both @source1 and @source2. **/ void -gdk_region_intersect (GdkRegion *source1, - GdkRegion *source2) +gdk_region_intersect (GdkRegion *source1, + const GdkRegion *source2) { g_return_if_fail (source1 != NULL); g_return_if_fail (source2 != NULL); @@ -578,7 +578,7 @@ gdk_region_intersect (GdkRegion *source1, (!EXTENTCHECK(&source1->extents, &source2->extents))) source1->numRects = 0; else - miRegionOp (source1, source1, source2, + miRegionOp (source1, source1, source2, miIntersectO, (nonOverlapFunc) NULL, (nonOverlapFunc) NULL); /* @@ -591,8 +591,8 @@ gdk_region_intersect (GdkRegion *source1, } static void -miRegionCopy (GdkRegion *dstrgn, - GdkRegion *rgn) +miRegionCopy (GdkRegion *dstrgn, + const GdkRegion *rgn) { if (dstrgn != rgn) /* don't want to copy to itself */ { @@ -788,15 +788,15 @@ miCoalesce (GdkRegion *pReg, /* Region to coalesce */ */ /* static void*/ static void -miRegionOp(GdkRegion *newReg, - GdkRegion *reg1, - GdkRegion *reg2, - overlapFunc overlapFn, /* Function to call for over- +miRegionOp(GdkRegion *newReg, + GdkRegion *reg1, + const GdkRegion *reg2, + overlapFunc overlapFn, /* Function to call for over- * lapping bands */ - nonOverlapFunc nonOverlap1Fn, /* Function to call for non- + nonOverlapFunc nonOverlap1Fn, /* Function to call for non- * overlapping bands in region * 1 */ - nonOverlapFunc nonOverlap2Fn) /* Function to call for non- + nonOverlapFunc nonOverlap2Fn) /* Function to call for non- * overlapping bands in region * 2 */ { @@ -1189,8 +1189,8 @@ miUnionO (GdkRegion *pReg, * either @source1 or @source2. **/ void -gdk_region_union (GdkRegion *source1, - GdkRegion *source2) +gdk_region_union (GdkRegion *source1, + const GdkRegion *source2) { g_return_if_fail (source1 != NULL); g_return_if_fail (source2 != NULL); @@ -1450,8 +1450,8 @@ miSubtractO (GdkRegion *pReg, * area is the set of pixels contained in @source1 but not in @source2. **/ void -gdk_region_subtract (GdkRegion *source1, - GdkRegion *source2) +gdk_region_subtract (GdkRegion *source1, + const GdkRegion *source2) { g_return_if_fail (source1 != NULL); g_return_if_fail (source2 != NULL); @@ -1483,8 +1483,8 @@ gdk_region_subtract (GdkRegion *source1, * or the other of the two sources but not in both. **/ void -gdk_region_xor (GdkRegion *source1, - GdkRegion *source2) +gdk_region_xor (GdkRegion *source1, + const GdkRegion *source2) { GdkRegion *trb; @@ -1510,7 +1510,7 @@ gdk_region_xor (GdkRegion *source1, * Returns: %TRUE if @region is empty. */ gboolean -gdk_region_empty (GdkRegion *region) +gdk_region_empty (const GdkRegion *region) { g_return_val_if_fail (region != NULL, FALSE); @@ -1530,8 +1530,8 @@ gdk_region_empty (GdkRegion *region) * Returns: %TRUE if @region1 and @region2 are equal. */ gboolean -gdk_region_equal (GdkRegion *region1, - GdkRegion *region2) +gdk_region_equal (const GdkRegion *region1, + const GdkRegion *region2) { int i; @@ -1566,9 +1566,9 @@ gdk_region_equal (GdkRegion *region1, * Returns: %TRUE if the point is in @region. */ gboolean -gdk_region_point_in (GdkRegion *region, - int x, - int y) +gdk_region_point_in (const GdkRegion *region, + int x, + int y) { int i; @@ -1598,8 +1598,8 @@ gdk_region_point_in (GdkRegion *region, * outside, or partly inside the #GdkRegion, respectively. */ GdkOverlapType -gdk_region_rect_in (GdkRegion *region, - GdkRectangle *rectangle) +gdk_region_rect_in (const GdkRegion *region, + const GdkRectangle *rectangle) { GdkRegionBox *pbox; GdkRegionBox *pboxEnd; |