summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--gdk/gdkrectangle.c2
3 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dcf155db0..bb64e10690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-28 Behdad Esfahbod <behdad@gnome.org>
+
+ * gdk/gdkrectangle.c (gdk_rectangle_union, gdk_rectangle_intersect):
+ Note in docs that @dest can be the same as @src1 or @src2. (#343233,
+ Christian Persch)
+
2006-05-28 Kristian Rietveld <kris@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_flat_box): handle
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1dcf155db0..bb64e10690 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-05-28 Behdad Esfahbod <behdad@gnome.org>
+
+ * gdk/gdkrectangle.c (gdk_rectangle_union, gdk_rectangle_intersect):
+ Note in docs that @dest can be the same as @src1 or @src2. (#343233,
+ Christian Persch)
+
2006-05-28 Kristian Rietveld <kris@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_flat_box): handle
diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 427dbfd491..0e13b14bbd 100644
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -37,6 +37,7 @@
* 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.
+ * It is allowed for @dest to be the same as either @src1 or @src2.
*/
void
gdk_rectangle_union (GdkRectangle *src1,
@@ -64,6 +65,7 @@ gdk_rectangle_union (GdkRectangle *src1,
* @dest: return location for the intersection of @src1 and @src2
*
* Calculates the intersection of two rectangles.
+ * It is allowed for @dest to be the same as either @src1 or @src2.
*
* Returns: %TRUE if the rectangles intersect.
*/