Merges from gtk-1-2

[~andy/gtk] / gtk / gtkhscale.c

diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index e138ef1f1263d16548cbc8801714c208666802a8..51037cb579fcae3cccc3bb2c427596c99f0e7153 100644 (file)
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -476,6 +476,8 @@ gtk_hscale_pos_background (GtkHScale *hscale,
       *h -= theight;
       break;
     }
+  *w = MAX (*w, 0);
+  *h = MAX (*h, 0);
 }
 
 static void