gtk+ r21806 - in branches/gtk-2-14: . gtk

[tvb svn gnome org]

Author: tvb
Date: Mon Nov 24 19:26:12 2008
New Revision: 21806
URL: http://svn.gnome.org/viewvc/gtk+?rev=21806&view=rev

Log:
2008-11-24  Tristan Van Berkom <tvb gnome org>

	* gtk/gtkalignment.c: Bug 561539 - Fix warnings when size allocations
	fall short of border width and padding.



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gtk/gtkalignment.c

Modified: branches/gtk-2-14/gtk/gtkalignment.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkalignment.c	(original)
+++ branches/gtk-2-14/gtk/gtkalignment.c	Mon Nov 24 19:26:12 2008
@@ -466,8 +466,8 @@
       padding_horizontal = priv->padding_left + priv->padding_right;
       padding_vertical = priv->padding_top + priv->padding_bottom;
 
-      width = allocation->width - padding_horizontal - 2 * border_width;
-      height = allocation->height - padding_vertical - 2 * border_width;
+      width  = MAX (1, allocation->width - padding_horizontal - 2 * border_width);
+      height = MAX (1, allocation->height - padding_vertical - 2 * border_width);
     
       if (width > child_requisition.width)
 	child_allocation.width = (child_requisition.width *