summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Hasselmann <mathias.hasselmann@gmx.de>2007-08-28 21:04:21 +0000
committerMathias Hasselmann <hasselmm@src.gnome.org>2007-08-28 21:04:21 +0000
commit48334023dd13f749a84cf83bb1d18774d2393e1c (patch)
tree39c35a9d3cdb5d27a5466f5944184f001966b918
parent865d99df0438eae2b5c38d5361243067229b679d (diff)
downloadgtk+-extended-layout.tar.gz
Make sure natural_delta is initialized.extended-layout
2007-08-28 Mathias Hasselmann <mathias.hasselmann@gmx.de> * gtk/gtktable.c: Make sure natural_delta is initialized. svn path=/branches/extended-layout/; revision=18698
-rw-r--r--ChangeLog.gtk-extended-layout4
-rw-r--r--gtk/gtktable.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.gtk-extended-layout b/ChangeLog.gtk-extended-layout
index ba00c6907b..f84275254c 100644
--- a/ChangeLog.gtk-extended-layout
+++ b/ChangeLog.gtk-extended-layout
@@ -1,5 +1,9 @@
2007-08-28 Mathias Hasselmann <mathias.hasselmann@gmx.de>
+ * gtk/gtktable.c: Make sure natural_delta is initialized.
+
+2007-08-28 Mathias Hasselmann <mathias.hasselmann@gmx.de>
+
* tests/testextendedlayout.c: Test size-for-allocation for GtkTable.
* gtk/gtk.symbols, gtk/gtktable.c, gtk/gtktable.h: Add orientation
property needed for choosing a size-for-allocation strategy.
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index 006fc4ec79..eb94c5d733 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -1487,6 +1487,7 @@ gtk_table_size_allocate_pass1 (GtkTable *table)
real_width = GTK_WIDGET (table)->allocation.width - GTK_CONTAINER (table)->border_width * 2;
real_height = GTK_WIDGET (table)->allocation.height - GTK_CONTAINER (table)->border_width * 2;
+ natural_delta = 0;
if (table->homogeneous)
{
@@ -1521,7 +1522,6 @@ gtk_table_size_allocate_pass1 (GtkTable *table)
width = 0;
nexpand = 0;
nshrink = 0;
- natural_delta = 0;
for (col = 0; col < table->ncols; col++)
{