diff --git a/ChangeLog b/ChangeLog index 88108ed49f..9d40ebef11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-12-24 Matthias Clasen + + * gdk/gdkrectangle.c: Inline docs. + Thu Dec 22 18:53:14 2005 Tim Janik * gtk/gtkobject.[hc]: renamed GUnowned to GInitiallyUnowned. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 88108ed49f..9d40ebef11 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2005-12-24 Matthias Clasen + + * gdk/gdkrectangle.c: Inline docs. + Thu Dec 22 18:53:14 2005 Tim Janik * gtk/gtkobject.[hc]: renamed GUnowned to GInitiallyUnowned. diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c index 649521a32c..427dbfd491 100644 --- a/gdk/gdkrectangle.c +++ b/gdk/gdkrectangle.c @@ -28,6 +28,16 @@ #include #include "gdkalias.h" +/** + * gdk_rectangle_union: + * @src1: a #GdkRectangle + * @src2: a #GdkRectangle + * @dest: return location for the union of @src1 and @src2 + * + * Calculates the union of two rectangles. + * The union of rectangles @src1 and @src2 is the smallest rectangle which + * includes both @src1 and @src2 within it. + */ void gdk_rectangle_union (GdkRectangle *src1, GdkRectangle *src2, @@ -47,6 +57,16 @@ gdk_rectangle_union (GdkRectangle *src1, dest->y = dest_y; } +/** + * gdk_rectangle_intersect: + * @src1: a #GdkRectangle + * @src2: a #GdkRectangle + * @dest: return location for the intersection of @src1 and @src2 + * + * Calculates the intersection of two rectangles. + * + * Returns: %TRUE if the rectangles intersect. + */ gboolean gdk_rectangle_intersect (GdkRectangle *src1, GdkRectangle *src2,